merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 6 Jun 2013 11:11:30 +0000 (11:11 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 6 Jun 2013 11:11:30 +0000 (11:11 +0000)
commit1190e0968913bb57cbc8b23e6807590b7a46ba44
treecde0caa4026c2d64a43ae6a7cf8910f6f8c57e3c
parent3e15f7a3e18de796830032aa42514ee567c0079f
merge-update from trunk