edan_f0

David Winterbottom 669c50df65 Merge branch 'search' of https://github.com/a-musing-moose/django-oscar into search Updated setup.py command Conflicts: docs/source/reference/settings.rst examples/defaultshop/settings.py oscar/tests.py oscar/urls.py		14年前
..
settings.rst	Merge branch 'search' of https://github.com/a-musing-moose/django-oscar into search	14年前