tree 219cf9ece2cd3a47096d5fcf1bdcf899f95482b1
parent f0d6bffe580f3338b56a8446bfcb4b19fd7668d1
parent d20018f2d8865adabe6d778c436c9dacd02fb4e0
author Edwin Kempin <edwin.kempin@sap.com> 1410525592 +0200
committer Edwin Kempin <edwin.kempin@sap.com> 1410525647 +0200

Merge branch 'stable-2.9'

* Fix reloading of configuration changes

Change-Id: I8290793aa1d8dc28eba8ca127c20650c621ed74f
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>