merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 9 Oct 2014 13:31:50 +0000 (13:31 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 9 Oct 2014 13:31:50 +0000 (13:31 +0000)

No differences found