merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 19 Jul 2013 11:36:59 +0000 (11:36 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 19 Jul 2013 11:36:59 +0000 (11:36 +0000)
commitee7cb61660ef7326b28830bc87d0721ee260d518
tree49bcdad5dc73175357fca1ac84ad330e65682fe3
parent67b5ea6c38869aaf5b1f4186fc1a8c99907855f0
parentb57243249609ddd3e26d1b6fa225b90ff2b63d72
merge-update from trunk