merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 30 Jul 2014 08:03:58 +0000 (08:03 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 30 Jul 2014 08:03:58 +0000 (08:03 +0000)
commit58aa8ac505ace570fc0b1177bdb9c898ada2e385
treeae364720bc991257596c3e8e49f10707b49d0e7d
parentcbbdee0f41a99686e074317f00a4d44bf9b36bd3
merge-update from trunk