merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 8 Oct 2013 13:59:20 +0000 (13:59 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 8 Oct 2013 13:59:20 +0000 (13:59 +0000)
commit1c3b2bdea221fee86e2b771d14dc00aed55644df
tree7cf689923ede40120178b67d7d2418b8c7e989a6
parent370821f1ed25ac683cb986251996f63b56f9cf95
parent55790ccd06e247d4fe17648f5b7c9888ac98de53
merge-update from trunk