merge from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 09:21:05 +0000 (09:21 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 09:21:05 +0000 (09:21 +0000)
commitcf72f9913bac22121ef380b1e8d3d1d8083e127d
tree055c237172b7e8366f6fad2323a4a5b2e1848f1d
parent54d4021117f894afd018e18e3abc8dd0628fef2d
merge from trunk