OCA/server-tools — pull request #40 by gurneyalex (2014-08-18 07:41:34+00:00)
Title: merge 7.0 changes to master

forward port recent changes made to the 7.0 branch to master