Merge branch 'master' into releases 3.2.6.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:57:13 +0000 (10:57 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:57:13 +0000 (10:57 +0200)
commit95e671b15104bb05c8302000facc906cbf0b133e
tree0f43cbe6d7656e84b6f3ed89f60a74c18b1d9ef2
parent42c90fcf3dd414871b0994ea00f149ddf2986c6b
parent111f9432256ce35b49f4729fd94ee19e2a9b9110
Merge branch 'master' into releases