merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Jul 2013 17:42:18 +0000 (17:42 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 22 Jul 2013 17:42:18 +0000 (17:42 +0000)
commit46f21ce36b0a0cf9372d618ae4f7c008f120e7cd
tree1e3001a9d61b90f3912cddeb63e01e4b3ea09f75
parent8743e9e9786dad3c0c11c50a6c01b9173e9a7e93
parent2874935c14cc25925f5bce278b9d934af1d36142
merge-update from trunk