[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
authorbth-openerp <bth@tinyerp.com>
Mon, 28 Oct 2013 05:06:19 +0000 (10:36 +0530)
committerbth-openerp <bth@tinyerp.com>
Mon, 28 Oct 2013 05:06:19 +0000 (10:36 +0530)
bzr revid: bth@tinyerp.com-20131025073900-6mtnjubig1a58z3w
bzr revid: bth@tinyerp.com-20131028050619-mgo366142cdny2io


Trivial merge