Merge branch 'master' into releases 3.0.5
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:44:02 +0000 (10:44 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:44:02 +0000 (10:44 +0200)
commitf4afcfc617fe36ce18d3509ef20d90b0db271bea
treeb20da3ba3a0f48760ae764eab2bfdc07bdfb3e7e
parent2622581d611b8b727b1f7c4cffd3d72bcd9065bf
parentbcf0b6f2f2fbcb33be313cbfffeabe64b1aa58d0
Merge branch 'master' into releases