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

No differences found