added merge-info by merging with trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 19 Jul 2013 10:58:30 +0000 (10:58 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 19 Jul 2013 10:58:30 +0000 (10:58 +0000)

No differences found