merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 8 Oct 2013 11:39:46 +0000 (11:39 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 8 Oct 2013 11:39:46 +0000 (11:39 +0000)

No differences found