[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
authorbth-openerp <bth@tinyerp.com>
Mon, 30 Sep 2013 10:24:30 +0000 (15:54 +0530)
committerbth-openerp <bth@tinyerp.com>
Mon, 30 Sep 2013 10:24:30 +0000 (15:54 +0530)
commit8ecd77d367ffbc06dfe79e9e90e2ecad9e82461b
tree05e7a1c4e2c3685ef74be348e2b21e4de3df9076
parent1d1bd3a4a3e23ffe3222ba1b2f9d34a4d2cc5a29
parentaf96efffc9d12e827374841361e2fa89b426a59f
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.

bzr revid: bth@tinyerp.com-20130930102430-vnjn78mn65mq03r0