merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 23 Jul 2013 11:31:47 +0000 (11:31 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 23 Jul 2013 11:31:47 +0000 (11:31 +0000)
commitf9726ce77c2b9a01782a4fc823428fe92b2aa559
treec31bca2d19e75c9abdba256fa15817ee3e07a8bf
parent46f21ce36b0a0cf9372d618ae4f7c008f120e7cd
parent89e7a3e1c8aad78cdadad605510a30bed3896bf0
merge-update from trunk