merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 13 Jul 2015 08:20:22 +0000 (08:20 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 13 Jul 2015 08:20:22 +0000 (08:20 +0000)
commit4d5671d9082b02e44f4827c8725dc764d3f38b16
treedbdc648e8862bfcdda4753b0b95dfb9b35abb108
parent28f22082c92e1f9f53c6503e1b9a0fe9bd089fd9
parentd37eb206f4955799ef037bbe4a72c1c9960d573d
merge-update from trunk