Merge branch 'master' into releases 3.1.1
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:49:18 +0000 (10:49 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:49:18 +0000 (10:49 +0200)
commitd0fdd22ffb70dbd65efbabc6c509fb6ef75558c4
tree67a25bb1e19bd33e139642e62c91332a70f67374
parent24fbe612bfb4e4a49c79f7cbade55c3c258441d8
parent43670d1e17b62b4f06a6b967f6a7a7d6840766e1
Merge branch 'master' into releases