merge-update from trunk taxeditor-3.4 root/branches/taxeditor/taxeditor-3.4
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 22 Oct 2014 12:42:13 +0000 (12:42 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 22 Oct 2014 12:42:13 +0000 (12:42 +0000)
commitded5bf57bb20d3eadcf3ce654c0c5af25d4cd33f
tree667eb6f64a92aee7638406c13b797b1f7d9ba168
parentfe371b32661ab61fbe58314dcd745ee69c2cf55b
merge-update from trunk