jdate
Merge remote-tracking branch 'origin/master'

Conflicts:
	wiki/admin.py
jdate