merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 29 Jun 2015 13:25:18 +0000 (13:25 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 29 Jun 2015 13:25:18 +0000 (13:25 +0000)
commit3419670f29743617b6f572f9e8485612ea8216f6
tree78f10db7a56da3530c698651b6c4b67d79838101
parent501725be27949a85cc33dfab97c2e9844edbd291
parent3e1ed38cfaf2396488af86f0a9f8fcc6bed5c305
merge-update from trunk