Merge branch 'master' into releases 3.1.2
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:50:23 +0000 (10:50 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:50:23 +0000 (10:50 +0200)
commitbfcccf30d39e98f488fa1c0bac7551a0e54ee170
tree8a23965ca81d6c9767edd993ef3eb39f79c7ae8f
parentd0fdd22ffb70dbd65efbabc6c509fb6ef75558c4
parentea6e4698905d7440a265e323d03cf13fc323c44b
Merge branch 'master' into releases