Merge branch 'manpages' of https://github.com/seppeljordan/pywifizone
Merge branch 'master' of https://github.com/baldulin/pywifizone