merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 2 Oct 2013 07:07:34 +0000 (07:07 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 2 Oct 2013 07:07:34 +0000 (07:07 +0000)
commita91f6deaa52495198afecf748fa83bb1f9c45331
treecbd9b4f13719af9be6c99073a36a63ed6affef68
parent89fdf8a256e2d17ffec83b4030e00365b22137e8
parent9d9682a742c937385809e72e7dfa58ffc86d924e
merge-update from trunk