[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
authorbth-openerp <bth@tinyerp.com>
Mon, 11 Nov 2013 09:49:34 +0000 (15:19 +0530)
committerbth-openerp <bth@tinyerp.com>
Mon, 11 Nov 2013 09:49:34 +0000 (15:19 +0530)
commitfbda16c26b6c75e368ef880e97a0bdfaa12a51a7
tree88cd7ddb744cfcb45e36c35a856fa2fbe6b76b1b
parent596da49accdac37f9cbd32a15233decb9eab7050
parent221c6b7dbd2ee6bfd334419ea3945f177103cd58
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.

bzr revid: bth@tinyerp.com-20131111094934-qh95bt41fptwepm0
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass