[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)
commitb9397bd62eb3de389efbd5b27b5e6721324dfcff
tree26010c4a18ff6ff387e9d5371b0d250eea10245b
parent1a2c57343f62e16538f56ac6a54829d6e37e6198
parent77e79435d08a1a83bf8c2fad8216773304bafadb
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.

bzr revid: bth@tinyerp.com-20131025073900-6mtnjubig1a58z3w
bzr revid: bth@tinyerp.com-20131028050619-mgo366142cdny2io