Merge branch 'hotfix/3.12.2' root/tags/taxeditor/3.12.2 3.12.2
authorjenkins <jenkins-int@bgbm.org>
Tue, 12 Jan 2016 09:10:14 +0000 (10:10 +0100)
committerjenkins <jenkins-int@bgbm.org>
Tue, 12 Jan 2016 09:10:14 +0000 (10:10 +0100)
commit0e7f758d1a7791a055f1799d922e88dc4b587bb9
tree4cab2255f119a3c4a5899d1ab7c9267ad997bcb2
parenta432ab069950b00f31c1b4c5d3a663b203079328
parent0f343e3a52fc38dc2ba612c8e758fbfbc73c159b
Merge branch 'hotfix/3.12.2'