Reverted offer change which had looked to be a fix but was illusory.
Can't recreate this issue locally so fixing it is a pain.
Adjusted fixtures to remove test warnings.
Also altered haystack version in setup.
Actually discount things
Merge branch 'releases/0.1' of github.com:tangentlabs/django-oscar in…
Fixed issue with product-class-based range checks
When merging baskets, pick higher q'ty instead of the sum of both
Merge pull request #232 from tangentlabs/fix-absolute-benefit
Fix absolute benefit
Fix absolute benefit application
This is a special benefit that does not have its own range. It therefore
should not consume the discounted items for the second time.
Tweaked PIL import statement which doesn't work on travis
Add PIL requirement
Add Django dep
Make setup executable
Don't break model state when creating kwargs
Make the cookie logic simple
Added Travis.ci config for 0.1 branch
Use select_for_update where available
Bumped version for 0.1.8 release
Added extra check to basket view to handle error seen in CDK project
Trimmed the quickstart settings down to a minumum override
Added delete address confirmation page
Added extra context to the order confirmation email sending
Fixed big in fix_local_url which was stripping off the last character
Fixed bug in __unicode__ method of PaymentEvent
Added check to oscar to prevent empty baskets from being submitted