merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 13 Aug 2014 09:26:27 +0000 (09:26 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 13 Aug 2014 09:26:27 +0000 (09:26 +0000)
commit0eafce3b8120aa81638466596dc8b4e0f715b4ce
tree2f229d6689d79d46734e8250b82cb3c3eb713826
parent60f606b4369404cd13d7580c4eb33273fb7cf6d8
parent0ccff120a8f98ce68a417f8b8417cace795172c5
merge-update from trunk