Merge branch 'master' into releases releases 3.3.1.2
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 09:00:08 +0000 (11:00 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 09:00:08 +0000 (11:00 +0200)
commitbace01c8d5b4baee8776394de380867856d7d61c
tree172929868dacda2bd80d726521fc7a86e350161f
parentfc4457661dae8eae32f70060111e74924e0dbf4d
parent07e47c9cc4c619ab000b1dd8d8b318eaf5bae3b3
Merge branch 'master' into releases