Merge branch 'release/4.2.0' root/tags/taxeditor/4.2.0 root/trunk/taxeditor 4.2.0
authorjenkins <jenkins-int@bgbm.org>
Wed, 6 Jul 2016 15:06:10 +0000 (17:06 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 6 Jul 2016 15:06:10 +0000 (17:06 +0200)
commitb550797b7e68178838b1c8afc77b37b728b8586d
tree9ff12176f0af4553f8b2113a0e46ddc8ecc55168
parentf37484b2ae7db2ca052cb4a153ffcc277330a639
parent5b574d183bef551bc2995145387dd0256975e2ce
Merge branch 'release/4.2.0'