merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Jan 2014 16:15:13 +0000 (16:15 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Jan 2014 16:15:13 +0000 (16:15 +0000)

No differences found