Merge branch 'master' into releases 3.3.1.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 09:00:00 +0000 (11:00 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 09:00:00 +0000 (11:00 +0200)
commitcc5a0e1eae262a928c1a0f451c6ce401f52d8828
tree64c131051715eadb33fc57fd86447b077644a64f
parentdbb6dd2fa61e2999cec9c129ba546a28db7ff602
parentc91aa2b237bef6003ead8dfc98cdcab89f97c654
Merge branch 'master' into releases