Merge branch 'master' into releases 3.3.0.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:59:16 +0000 (10:59 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:59:16 +0000 (10:59 +0200)
commitfc5c46ee4587fb1bbc60a1b6bfc0221d83be3d81
treef92ca10cce316a7b65313b312d1588f58d81ffaf
parent21d98987523453cd39ea3de441b0a69546f89dfc
parente51177796149f37de339bda83558c3c49758be93
Merge branch 'master' into releases