Merge branch 'master' of https://github.com/markokr/skytools into develop
authormartinko <[email protected]>
Mon, 3 Feb 2014 08:28:08 +0000 (09:28 +0100)
committermartinko <[email protected]>
Mon, 3 Feb 2014 08:28:08 +0000 (09:28 +0100)
Conflicts:
debian/changelog


Trivial merge