[MERGE]Merge trunk-website-al.
authorbth-openerp <bth@tinyerp.com>
Thu, 24 Oct 2013 05:15:43 +0000 (10:45 +0530)
committerbth-openerp <bth@tinyerp.com>
Thu, 24 Oct 2013 05:15:43 +0000 (10:45 +0530)
commit12ca31cb2d95749332ddee07b3c2b19e5b746e6b
treec5a3021f38e0caf39abcd117cd190891a0171cb8
parent17a37e775d4dcf7312ec6792c0f16adcc4cba5e0
parentd5379f3b7cfba31dac8b7cfa9251243e26c7f018
[MERGE]Merge trunk-website-al.

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