merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 23 Jun 2014 10:48:11 +0000 (10:48 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 23 Jun 2014 10:48:11 +0000 (10:48 +0000)
commit853cceaa7d35a0ab9e8147caf6a741a3b631276d
treec296b93a4d99921d0d129d6994cfc62540b505a5
parenta14d1bae76c571b2541a085a7abfb91dd6a93273
parent8e0490a5febc03e957ab78c83b5b989439b0f80a
merge-update from trunk