Merge branch 'master' into releases 3.3.1.1
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 09:00:04 +0000 (11:00 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 09:00:04 +0000 (11:00 +0200)
commitfc4457661dae8eae32f70060111e74924e0dbf4d
tree73e59f043998559e43ef1dddf72713a07b3116fe
parentcc5a0e1eae262a928c1a0f451c6ce401f52d8828
parent94f017e57e45fae89e35a4948fe7005bdf3f13ba
Merge branch 'master' into releases