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)
commitf8989f45177ddc31a3ff09ab7c5a1880d990ad5a
tree49bcdad5dc73175357fca1ac84ad330e65682fe3
parent03db5595210d1d3c56a09fb920840cbfef2ae981
added merge-info by merging with trunk