tree 14dc26d6a9d2202387286284e667e3ceec078848
parent d464655c1b8da52b59a6c9c811484da6aacc4921
parent 98ced021ec37b3b45e08bb09f470d942c25dbb87
author Edwin Kempin <edwin.kempin@sap.com> 1435145650 +0200
committer Edwin Kempin <edwin.kempin@sap.com> 1435145673 +0200

Merge branch 'stable-2.11'

* stable-2.11:
  Describe how admins can control what service users can do

Change-Id: I2d8d21b8f7745eae8a46dab26fe901b2a3e5714a