[MERGE]Merge trunk-website-al.
authorbth-openerp <bth@tinyerp.com>
Wed, 23 Oct 2013 13:08:55 +0000 (18:38 +0530)
committerbth-openerp <bth@tinyerp.com>
Wed, 23 Oct 2013 13:08:55 +0000 (18:38 +0530)
commit9efb55b0beb4e3c1bd2e4d6d0718b75d0cb9836d
treef83ba56de1ffe854ee90755eab6c254f5ae202f0
parentc8d1d72a0b927047b3bc83b302c58051b087c13b
parent7dd1934585ed85b925def0a686df04aa3990c5f5
[MERGE]Merge trunk-website-al.

bzr revid: bth@tinyerp.com-20131023130855-6rt6rip6x1h04xc5