Merge branch 'master' into releases 2.1.1
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:38:06 +0000 (10:38 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:38:06 +0000 (10:38 +0200)
commit61b7a6573a37f9df0710579ad11cc9474aa6f0fc
tree5219b192a5821b78b0d6783689263e321ac92792
parent4f6fe351c7b605d97c1ba8f482fb72e467dc19cb
parent1e4d3fd0343fa76d5d1e2803b33bb6faa97403d4
Merge branch 'master' into releases