Merge branch 'hotfix/3.11.1' root/tags/cdmlib/3.11.1 3.11.1
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Mon, 28 Sep 2015 15:34:16 +0000 (17:34 +0200)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Mon, 28 Sep 2015 15:34:16 +0000 (17:34 +0200)
commit5740535eed2ef356853c9b3e7227af211ab81c61
treeb875f46fbb8a38da2307af95aa4b358ad59046f1
parentddcc5e18954d37a8a6e05d8836962b071fa13267
parent6f564b84e454faec4192524e26f5d236939511ba
Merge branch 'hotfix/3.11.1'