David Winterbottom
130770f647
Merge branch 'master' into search
Had to add "apps" to many of the import paths within the search module
Conflicts:
examples/vanilla/settings.py
oscar/apps/promotions/views.py
oscar/tests.py
oscar/urls.py
requirements-dev.txt