Merge branch 'develop' into hotfix/3.2.1
authormartinko <gamato@users.sf.net>
Wed, 9 Apr 2014 15:21:43 +0000 (17:21 +0200)
committermartinko <gamato@users.sf.net>
Wed, 9 Apr 2014 15:21:43 +0000 (17:21 +0200)
commit07c560c5f3a8b51cb4a492bff8af191fb60edc9a
tree5750ed444d957a7ea6e2af16dd7be14c2b703a45
parentfc1e1f4b7a9b50418c41045c92fbe31947b83796
parentc4640cc4f5097a3b50d5ecca5ae503bcfacddb8f
Merge branch 'develop' into hotfix/3.2.1