Merge branch 'master' of skype-git:/git/dba/skytools-3
authormartinko <gamato@users.sf.net>
Fri, 20 Sep 2013 14:09:06 +0000 (16:09 +0200)
committermartinko <gamato@users.sf.net>
Fri, 20 Sep 2013 14:09:06 +0000 (16:09 +0200)

Trivial merge