Merge branch 'hotfix/3.2.1' 3.2.1
authormartinko <gamato@users.sf.net>
Wed, 9 Apr 2014 15:59:41 +0000 (17:59 +0200)
committermartinko <gamato@users.sf.net>
Wed, 9 Apr 2014 15:59:41 +0000 (17:59 +0200)
commit6a9886999803374012911d4d7c23b5cbe20d135d
tree61387285df68b9e8ca6600959fbe0871565ce6cf
parentfc1e1f4b7a9b50418c41045c92fbe31947b83796
parent6cbc2e5037323718fed3d7a1ff7d8964db669599
Merge branch 'hotfix/3.2.1'