Merge branch 'master' into releases 3.2.2
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:53:10 +0000 (10:53 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:53:10 +0000 (10:53 +0200)
commitb6764658a537d18821afe606350e26d95b6daff6
treeeb5cb490e3535aa18648f0e48571005281ef04f1
parent0bb8665ef2b5ff5430dd6808b0be7761912ce4e2
parent7758484aa10294db3689a7eacc9c4b64132d5d6e
Merge branch 'master' into releases