merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Jul 2013 17:41:45 +0000 (17:41 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Jul 2013 17:41:45 +0000 (17:41 +0000)

No differences found