merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 07:59:13 +0000 (07:59 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 07:59:13 +0000 (07:59 +0000)
commitbd176faf53f878b04368f04e825f04db40a1f939
tree3ff1ba37beadbf4398a1607abb56d71f5a945143
parent016760da2cad6724b57bdc309e97e6a8a7c0b7cf
parentf0a072ffadf67e7475bffda67dd4d8e09032f710
merge-update from trunk