merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 19 Jul 2013 11:35:03 +0000 (11:35 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 19 Jul 2013 11:35:03 +0000 (11:35 +0000)

No differences found