SECRET_KEY in special file
Merge branch 'master' of ssh://denex.dyndns.org:443/~/ical

Conflicts:
	ical/settings.py