Merge branch 'master' into releases 1.3.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:33:30 +0000 (10:33 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:33:30 +0000 (10:33 +0200)
commit4b0e4c62074b641ea80d628a9a0d00df15f1d6bc
treefe711968f0356edffa9b51286e89917cc9cf19e5
parent372782865e5e5791701d0f2bdfaa454cf45a59c3
parent629ac5b85f0d60b24828590de3430c52f42607dc
Merge branch 'master' into releases