merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 11:53:44 +0000 (11:53 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 11:53:44 +0000 (11:53 +0000)
commit32518d59b9dc9862c87860644a8db16a11104fe9
treed1a6ba628ac32964420c743115ad2f9a19201ac8
parentef974737e44f677001b02e55fa8da77ed1cc2d0e
parent68d4a034f4a95a61d607328b664d909a07c2ff6e
merge-update from trunk