Merge branch 'hotfix/3.12.2' root/tags/cdmlib/3.12.2 3.12.2
authorjenkins <jenkins-int@bgbm.org>
Mon, 11 Jan 2016 12:50:35 +0000 (13:50 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 11 Jan 2016 12:50:35 +0000 (13:50 +0100)
commit30fdb797c7209043251188f6cfc102e3b6827e27
tree13931edc1b8fcf7d1a5a8246a5e0c76c24ca1ed0
parent7a5b92d6faeadf16e1a658f9b5b5cdbc5e12909d
parentc293ed772fe4e52f24a5911810df0b3d631fe737
Merge branch 'hotfix/3.12.2'