Merge branch 'master' into releases 1.2.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:32:16 +0000 (10:32 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:32:16 +0000 (10:32 +0200)
commit372782865e5e5791701d0f2bdfaa454cf45a59c3
tree1dfd575173f40bec95a3a6cc45ce3f2394fd16f5
parentc95428b8dc9d94d39c70acf804826150598a8bdf
parentd4c11da68a7271553ca5591adfae54fd3b45011f
Merge branch 'master' into releases