Merge branch 'master' into releases 3.2.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:52:13 +0000 (10:52 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:52:13 +0000 (10:52 +0200)
commit8fe625d1de52598474fd560fdaa9806b971473d7
tree000c2d032f3e76ae53d2a7c852f0708e9fe93ee3
parentbfcccf30d39e98f488fa1c0bac7551a0e54ee170
parent9618cdb31ec89b5f68f79a0d6011cd0c6c580a85
Merge branch 'master' into releases