Merge branch 'master' into releases 3.0.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:43:05 +0000 (10:43 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:43:05 +0000 (10:43 +0200)
commit931f541075d35124138ddcd63e8aab0d8b0d05bc
treec7034e0d6ac16220921e9045ffc08a6343ec8830
parent61b7a6573a37f9df0710579ad11cc9474aa6f0fc
parent5f4853f8672712c12c9063b1ab5ec3674f09218e
Merge branch 'master' into releases