merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 6 Aug 2014 07:20:47 +0000 (07:20 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 6 Aug 2014 07:20:47 +0000 (07:20 +0000)
commit5c4ad591184acdb32b294d3c690936b3c7718b3b
tree48970ecacefa5b4c65735a73aa8c6481bad4c316
parent18751b7490ed10755cf9844bf8c7784478e33876
parentb79e447b11aae47607af757deac046638d270288
merge-update from trunk