merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 06:26:01 +0000 (06:26 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 06:26:01 +0000 (06:26 +0000)
commit016760da2cad6724b57bdc309e97e6a8a7c0b7cf
tree149b97e7f95bf2b6be88be2231f941622aca7f50
parent1c3b2bdea221fee86e2b771d14dc00aed55644df
parent377e5fa50d4524aa30fae43b6302874b9c614c72
merge-update from trunk