Merge branch 'master' into releases 1.4.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:34:38 +0000 (10:34 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:34:38 +0000 (10:34 +0200)
commitd5abc7280c24ee485393cf1c0a2f3637c20f3408
treed17edd1a5c0c9c645c8b27ae191146f48af22cf3
parent4b0e4c62074b641ea80d628a9a0d00df15f1d6bc
parenta16126b0981ba82ddcd5f7b0f763bc4ce6aa9bdc
Merge branch 'master' into releases