merge from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 09:27:11 +0000 (09:27 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 09:27:11 +0000 (09:27 +0000)
commit56fe2cf715820a50852cdcefe067959308783794
tree055c237172b7e8366f6fad2323a4a5b2e1848f1d
parentc46480266d94f6735f04a70d66f547780916cd7c
merge from trunk