[MERGE] sync from website-al
authorChristophe Matthieu <chm@openerp.com>
Fri, 18 Oct 2013 12:10:50 +0000 (14:10 +0200)
committerChristophe Matthieu <chm@openerp.com>
Fri, 18 Oct 2013 12:10:50 +0000 (14:10 +0200)
commit0445188ff263e099e6cfb32fc500593df6271f8c
tree2f260488597720ba8bd90a109f1241833cc09fad
parent666387a2746e24b9ca312261c3a536e9af4c9d4e
parenta93a0b384bbe8de1391ba70b8bedfb5930dc61f9
[MERGE] sync from website-al

bzr revid: chm@openerp.com-20131018121050-vpk0lltaia4lka4l
addons/payment_acquirer/__init__.py
addons/website_sale/models/product_attributes.py