Merge branch 'master' into releases 3.2.5
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:56:31 +0000 (10:56 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:56:31 +0000 (10:56 +0200)
commit42c90fcf3dd414871b0994ea00f149ddf2986c6b
treedd148813f615f5979470c67dd13c80189f1bd4e0
parentac4f3272beb264e6642bc84c44f3dc08e22680f2
parent0448c027347ae76facf5475a21884ca2476f035f
Merge branch 'master' into releases