merge from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 09:23:30 +0000 (09:23 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 09:23:30 +0000 (09:23 +0000)
commitc46480266d94f6735f04a70d66f547780916cd7c
tree055c237172b7e8366f6fad2323a4a5b2e1848f1d
parentcf72f9913bac22121ef380b1e8d3d1d8083e127d
merge from trunk