merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 8 Oct 2013 12:41:32 +0000 (12:41 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 8 Oct 2013 12:41:32 +0000 (12:41 +0000)
commit4aebadc96d2ce1ab1f85323e6cc5d9cdbdf4417a
tree8bfbf773953914baf0d31052191db4065ac1947c
parentbec9df5af7423ad65819c1ecc92f9f0bf61225ba
parent9108779400b48f66b3ea429f5776a0a236e63c9f
merge-update from trunk