Merge branch 'master' into releases 2.1.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:38:02 +0000 (10:38 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:38:02 +0000 (10:38 +0200)
commit4f6fe351c7b605d97c1ba8f482fb72e467dc19cb
treecfc6b77a485e4673f4f3e927cc0edf39788f313e
parentbcb174b5375ad10e279b20204c913c873fc2c65d
parent688d5ecd9dd6a29a959a6becf05c5fcba7fc90af
Merge branch 'master' into releases