merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 Oct 2014 12:58:38 +0000 (12:58 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 21 Oct 2014 12:58:38 +0000 (12:58 +0000)
commit56e15498b43917f72fe400c3707e1acc05a34a37
treeda50365e6b68730562f1433e89539f7fea9d29e9
parentb3a52538c3453d44929fd12eafc0ba1136c5b847
parentcd84b7b4fdd3757136f0c0fd87c3d402e69f8513
merge-update from trunk