merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 7 Jul 2014 12:35:11 +0000 (12:35 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 7 Jul 2014 12:35:11 +0000 (12:35 +0000)

No differences found