merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 8 Jul 2015 12:50:55 +0000 (12:50 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 8 Jul 2015 12:50:55 +0000 (12:50 +0000)
commit28f22082c92e1f9f53c6503e1b9a0fe9bd089fd9
tree223454241b07a3d14c29c634f541f2b21818be6d
parent483b8b8a197a98ad0bf8492e823e61f34d44a4bf
parentb933f37d14db71d8d755b6b004ce8109adbd9491
merge-update from trunk