Cleaned up trailing whitespace
Cleaned up trailing whitespace
Cleand up trailing whitespace in html files
Cleaned up trailing whitespace
Merge pull request #22 from MacLemon/whitespace-cleanup

Whitespace cleanup
Merge branch 'django_1_4_compatibility' of github.com:Metalab/mos into django_1_5_compatibility

Added .1 compatibility to requirements.txt

Conflicts:
	metalab/templates/admin/base.html
	metalab/templates/cal/eventinfo_nf.inc