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)
commit54d4021117f894afd018e18e3abc8dd0628fef2d
tree055c237172b7e8366f6fad2323a4a5b2e1848f1d
parent7e7e870fe978454343a5118842156675f1678fb9
merge from trunk