get_extra_cart_price needs the request
Merge pull request #230 from aitzol/master

get_extra_cart_price_field needs the request
Merge pull request #233 from sephii/cart-items-order

make order of the items in the cart deterministic
Merge pull request #232 from sephii/fr-translations

Add missing french translations
Cart views sanitize inputs
Merge pull request #234 from atheiste/master

Cart views sanitize inputs
Make sure the checkout confirmation redirect is not a permanent one.

Permanent redirects may be cached by the browser or a reverse proxy, causing
the view to be ignored. The order status then won't get updated.
Merge remote-tracking branch 'divio/master'

Conflicts:
	shop/views/cart.py
Merge branch 'checkout-redirect'