Fixed against tox
Merge branch 'master' of work.github.com:shichao-an/adium-sh