Merge branch 'master' into develop
authormartinko <gamato@users.sf.net>
Fri, 20 Sep 2013 12:51:13 +0000 (14:51 +0200)
committermartinko <gamato@users.sf.net>
Fri, 20 Sep 2013 12:51:13 +0000 (14:51 +0200)
commitb1dd3b92e1e9515a062bb395534deef987e9695c
tree2bed072ba7b49324af3edfcfd0739e2039de7cf0
parent900063c8f42339520f3702211d9a567599081fb6
parent6b9325e67b2d607eb24b2d2fe52cba8b4b92e66f
Merge branch 'master' into develop