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