Merge branch 'release/3.12.0' root/tags/taxeditor/3.12.0 3.12.0
authorjenkins <jenkins-int@bgbm.org>
Mon, 21 Dec 2015 10:30:53 +0000 (11:30 +0100)
committerjenkins <jenkins-int@bgbm.org>
Mon, 21 Dec 2015 10:30:53 +0000 (11:30 +0100)
commita432ab069950b00f31c1b4c5d3a663b203079328
treefede4c8ee1b92640058ac5b2c2aa2c90f5c63f9e
parent72c118d0b983148a53dc08e4d2733cf855cae863
parent58fc5f05983f7eadebe9da4a3ea00007f12c2b54
Merge branch 'release/3.12.0'