merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 11 Aug 2014 12:22:56 +0000 (12:22 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 11 Aug 2014 12:22:56 +0000 (12:22 +0000)
commit73a09d3f3c5277bb78c4500787d61086d6f529fc
tree73c483e10be2d01855f7aab2afb0e2495206c697
parent5c4ad591184acdb32b294d3c690936b3c7718b3b
parent1c215f0d27e5aec133606bf36f0c6f23bda84ad2
merge-update from trunk