merge from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 10:02:49 +0000 (10:02 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 10:02:49 +0000 (10:02 +0000)
commit46294101df429560406d98729427215ecaaca8bb
tree95bcf853290f5ff075d655fa55f4a209d98eb8e2
parent72cdfc6d8cffe4ac8b5982f7dcb76c0c5c7575a4
parentad0dd655500d6c79b2e9160e13d747ecb422eefb
merge from trunk