[MERGE] trunk-website-demo-partner-bth
authorChristophe Matthieu <chm@openerp.com>
Thu, 28 Nov 2013 17:36:21 +0000 (18:36 +0100)
committerChristophe Matthieu <chm@openerp.com>
Thu, 28 Nov 2013 17:36:21 +0000 (18:36 +0100)
commit0eeb29ac082ceb3962726e59d0620f09195a4f86
tree5b851c3c55960ba6e18e458601fd7a54c41f07b1
parent32ec9cccdd15f803fc02d664709ec40fe93921e5
parent8ed6aa96d77b3c4fc7c4a35e24ed72809e5327bf
[MERGE] trunk-website-demo-partner-bth

bzr revid: chm@openerp.com-20131128173621-ge78agxfpmxcbytu
addons/l10n_be_hr_payroll/l10n_be_hr_payroll_demo.xml
addons/membership/__openerp__.py
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass