merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 09:29:41 +0000 (09:29 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 09:29:41 +0000 (09:29 +0000)
commit72cdfc6d8cffe4ac8b5982f7dcb76c0c5c7575a4
tree055c237172b7e8366f6fad2323a4a5b2e1848f1d
parent56fe2cf715820a50852cdcefe067959308783794
merge-update from trunk