Merge branch 'master' into releases 3.2.1
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:53:04 +0000 (10:53 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:53:04 +0000 (10:53 +0200)
commit0bb8665ef2b5ff5430dd6808b0be7761912ce4e2
treeffdae30f5624b7aabd5ed074780ba08105aa66bc
parent8fe625d1de52598474fd560fdaa9806b971473d7
parent2fdb4e617465981e41dc59d4a8f78972075d0d8f
Merge branch 'master' into releases