Merge branch 'master' into releases 3.0.3
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:43:44 +0000 (10:43 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:43:44 +0000 (10:43 +0200)
commit2ee9128343a1ff13629253513033d55f22e69e8f
tree2df844a7c2c19523a2d18cddf727530a10d1a6f4
parentf6ffcacabb98192917943ce637b64a9f1e267305
parentba0b7e23777030bb74fcb16ef2000f8f7395d184
Merge branch 'master' into releases