Merge branch 'master' into releases 3.0.6
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:44:06 +0000 (10:44 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:44:06 +0000 (10:44 +0200)
commit30d40b2686550cc5ffd737ad4336bf7fccf2b4e1
tree320026bfb52450d3b6a49c366fda27ca5384f598
parentf4afcfc617fe36ce18d3509ef20d90b0db271bea
parent5fb8fb17649230a4c49de3de8164f8f3c07b1ed3
Merge branch 'master' into releases