xY
Merge branch 'master' of https://github.com/relic7/djdam

Conflicts:
	djdam/apps/searcher/views.py