merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 6 Jun 2013 11:11:30 +0000 (11:11 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 6 Jun 2013 11:11:30 +0000 (11:11 +0000)

No differences found