merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 Oct 2014 12:45:04 +0000 (12:45 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 Oct 2014 12:45:04 +0000 (12:45 +0000)
commit65d106f82f98b511665ab96766a934dc08c5ee87
tree15e3ef27f2729ef7606e27cd8f77e09f98b4a5a8
parent36a8fc69f8bbd8eb90c49d9552794faf75932701
merge-update from trunk