merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 7 Aug 2013 08:26:30 +0000 (08:26 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 7 Aug 2013 08:26:30 +0000 (08:26 +0000)

No differences found