[MERGE] Merged trunk-website-al and done changes according to that.
authorParamjit Singh Sahota <psa@tinyerp.com>
Fri, 30 Aug 2013 11:57:23 +0000 (17:27 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Fri, 30 Aug 2013 11:57:23 +0000 (17:27 +0530)
commit33d1107dd36dce457028e9d405487aaeaab03fea
tree6a8ad54d1cb87832d5239f90f203e889d3c24d47
parentf6707c2ee8a05d383832e57a72009d88cbf82430
parent3db7d635c00ea31454ad2d96872318b8cc36ad57
[MERGE] Merged trunk-website-al and done changes according to that.

bzr revid: psa@tinyerp.com-20130830115723-f35ej71osh2axv97
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass