Merge branch 'master' into releases 3.2.3
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:53:58 +0000 (10:53 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:53:58 +0000 (10:53 +0200)
commit8cbfc8a88d2eeb5400bad0ff556af7486532188f
treec7c998bc19901570f54667a20fde8a19873dd2b2
parentb6764658a537d18821afe606350e26d95b6daff6
parentc7ed5962d7405832eb76ba88fefe437582bda805
Merge branch 'master' into releases