Merge branch 'master' into releases 3.0.4
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:43:46 +0000 (10:43 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:43:46 +0000 (10:43 +0200)
commit2622581d611b8b727b1f7c4cffd3d72bcd9065bf
treee6ae9899f86ad034f5b6d569fd29f42e0b8e0d25
parent2ee9128343a1ff13629253513033d55f22e69e8f
parent9a1ccc76e3542f3974103e505b27fc1879f0f777
Merge branch 'master' into releases