Merge branch 'master' into releases 3.0.2
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:43:25 +0000 (10:43 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:43:25 +0000 (10:43 +0200)
commitf6ffcacabb98192917943ce637b64a9f1e267305
treec82b9d38424da57cd1337ad7507b8e4e9b7a16bb
parent5256734485f2dc391d80ddb70f7cdfe28fff2c75
parentff82111e5268a4eb1b7ebba28d3c1cf9c5d59973
Merge branch 'master' into releases