merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 19 Nov 2013 14:54:06 +0000 (14:54 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 19 Nov 2013 14:54:06 +0000 (14:54 +0000)
commit817695c4aec7fbdc597ee9f1eb7261b0ee456955
treedae8447f34379daa7da9702128bf7d0d6cf36b8f
parentacab478b55edaaa727161f7d4c336465f2829687
parent650cafb4ef730f5307d658729cdae4d5a0602868
merge-update from trunk