fix
Merge branch 'master' of https://github.com/ener/kohana-email