quantized percent discount return value
Merge branch 'fix_clean_fields'
negative discount
apply discount on full price, regardless of tax
price * quantity, silly
Merge branch 'master' of https://github.com/fusionbox/django-shop-discounts into develop

Conflicts:
	discount/mixins.py
no message
Merge branch 'develop' of ssh://bitbucket.org/arteria/django-shop-discounts
no message
no message
Merge branch 'develop' of ssh://bitbucket.org/arteria/django-shop-discounts