change url
Merge branch 'master' of tentacleriot.eu:pimail into fax

Conflicts:
	pimail.py
settings for fax
Merge branch 'master' into fax
faxing should now work