Merge branch 'master' into releases 2.0.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:35:44 +0000 (10:35 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:35:44 +0000 (10:35 +0200)
commit2cbd767942c3768dac9547b15208e457490a738b
tree8df00978b4c7fa90f0a15552ad600e46ade8c619
parentd5abc7280c24ee485393cf1c0a2f3637c20f3408
parent6cac6fc05528a4de065de5fc58ac51157b3e6c30
Merge branch 'master' into releases