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

No differences found