Merge branch 'master' into releases 3.3.0.1
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:59:22 +0000 (10:59 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:59:22 +0000 (10:59 +0200)
commitdbb6dd2fa61e2999cec9c129ba546a28db7ff602
tree2d9f2e6b15f19f7a331dab97b50183a7b3696db4
parentfc5c46ee4587fb1bbc60a1b6bfc0221d83be3d81
parent13ef501ab83974ff03258647540ebecad96e45ef
Merge branch 'master' into releases