Merge branch 'hotfix/3.2.4' into develop
authormartinko <gamato@users.sf.net>
Mon, 27 Oct 2014 09:53:23 +0000 (10:53 +0100)
committermartinko <gamato@users.sf.net>
Mon, 27 Oct 2014 09:53:23 +0000 (10:53 +0100)
commit7afd0f1441002cf6ad32139f4fabf590af58fb47
tree4dde1b6d8b9b36f8566ca284b7c5feefe34d8488
parentc1d2be0cfdafffe0710bb575d916b12734a6742d
parent61b38553c2a24073f1eb6ee6d4d5d434800c7e26
Merge branch 'hotfix/3.2.4' into develop