merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Jul 2015 11:18:00 +0000 (11:18 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 20 Jul 2015 11:18:00 +0000 (11:18 +0000)
commit3eaf9ce47566a462f404dc9bd9242aaf91c0d4e5
treeb58c4b92a2e2118a18021453eb0b16287fcbb975
parent7fbd9a6b73c27318b21e4507e314afd807155e80
parent1a4acf0815c3898bb42b4436f76f25db5aa10834
merge-update from trunk