merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 09:29:41 +0000 (09:29 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 09:29:41 +0000 (09:29 +0000)

No differences found