merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 4 Nov 2014 09:41:17 +0000 (09:41 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 4 Nov 2014 09:41:17 +0000 (09:41 +0000)
commit17d9afae7de111580050f14fa8f748efae55e6f8
tree55b63e74ccc440b09bc5ca16ca05baecd354f6d0
parent79ef938c5180a070265be8e76d3f2e1cd19b4307
parentee08683338790d9903ae761b36de299990b75509
merge-update from trunk