Merge branch 'master' into releases 3.2.6.1
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:57:17 +0000 (10:57 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:57:17 +0000 (10:57 +0200)
commit21d98987523453cd39ea3de441b0a69546f89dfc
tree4ca969d26a16f112f17c1437b61b68754710eef6
parent95e671b15104bb05c8302000facc906cbf0b133e
parent1ceb7ce8723b32b267758bfda3bb7903fff8ea7a
Merge branch 'master' into releases