line endings are going to be the death of me! ROLLBACK motherfucker! ROLLBACK!
Merge branch 'master' of https://github.com/frankhale/Miranda