merge from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 11:00:07 +0000 (11:00 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 7 Jun 2013 11:00:07 +0000 (11:00 +0000)
commitb81108b4eb751b9735ea40a5a3c6897bf9268c79
tree95bcf853290f5ff075d655fa55f4a209d98eb8e2
parent46294101df429560406d98729427215ecaaca8bb
merge from trunk