Merge branch 'release/3.2' into develop
authormartinko <gamato@users.sf.net>
Wed, 2 Apr 2014 14:55:14 +0000 (16:55 +0200)
committermartinko <gamato@users.sf.net>
Wed, 2 Apr 2014 14:55:14 +0000 (16:55 +0200)
commitb2c78f23cbfaa48d2e64f10e1cb69b29dcbe6819
tree2d2f66bde621f7ad0dd012911ad19fbdcfa7ffcc
parent2a15df391550a3eb49fe2fe4df06ee0600de53d7
parent62abe7b14dedaba7a6dd5678c8e0b4e3335ed81c
Merge branch 'release/3.2' into develop