Merge branch 'master' into releases 3.2.4
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:56:16 +0000 (10:56 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:56:16 +0000 (10:56 +0200)
commitac4f3272beb264e6642bc84c44f3dc08e22680f2
tree80bde7d7745a1df1fc46c687912b9c210fe7c576
parent8cbfc8a88d2eeb5400bad0ff556af7486532188f
parent28514fc1f1f57cd280c32fba47eed6893caa3641
Merge branch 'master' into releases