From: bth-openerp <bth@tinyerp.com>
Date: Thu, 24 Oct 2013 05:15:43 +0000 (+0530)
Subject: [MERGE]Merge trunk-website-al.
X-Git-Tag: InsPy_master01~73^2~724^2~44
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=12ca31cb2d95749332ddee07b3c2b19e5b746e6b;p=odoo%2Fodoo.git

[MERGE]Merge trunk-website-al.

bzr revid: bth@tinyerp.com-20131024051543-zow19or2yqh5kczn
---

12ca31cb2d95749332ddee07b3c2b19e5b746e6b