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

No differences found