Merge branch 'master' into releases 2.0.1
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:36:20 +0000 (10:36 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:36:20 +0000 (10:36 +0200)
commitbcb174b5375ad10e279b20204c913c873fc2c65d
tree4464975420976bee6cbedea237a7ae7622da4f48
parent2cbd767942c3768dac9547b15208e457490a738b
parentefd0d0abb853018aa3ccc3c727b39bd7f5ba679d
Merge branch 'master' into releases