merge-update from trunk attic/branches/taxeditor/campanula/19945
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 Jan 2014 15:03:58 +0000 (15:03 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 Jan 2014 15:03:58 +0000 (15:03 +0000)
commit57c74c0d99a960f69c4de6b99488e1df66c75201
tree5d23438ca6fd7f16f15a03e49c268ef5c4d2989c
parent37167c98dd1385261219f2b8e3f03389bf9b778c
merge-update from trunk