Merge branch 'master' of https://github.com/markokr/skytools into hotfix/3.2.5
authormartinko <gamato@users.sf.net>
Wed, 29 Oct 2014 08:41:14 +0000 (09:41 +0100)
committermartinko <gamato@users.sf.net>
Wed, 29 Oct 2014 08:41:14 +0000 (09:41 +0100)

Trivial merge