Merge branch 'hotfix/3.2.2' 3.2.2
authormartinko <gamato@users.sf.net>
Thu, 10 Apr 2014 12:09:48 +0000 (14:09 +0200)
committermartinko <gamato@users.sf.net>
Thu, 10 Apr 2014 12:09:48 +0000 (14:09 +0200)
commitc673f4c93725d6dcf071404f0ef84e9a0ea6b7ae
tree8e53bf2aab87d8666da903ee707435ad26a48817
parent6a9886999803374012911d4d7c23b5cbe20d135d
parentaa4252889823957e95e4a9cc43129af60f3e6c12
Merge branch 'hotfix/3.2.2'