[MERGE]Merge trunk-website-al.
authorbth-openerp <bth@tinyerp.com>
Thu, 24 Oct 2013 13:05:19 +0000 (18:35 +0530)
committerbth-openerp <bth@tinyerp.com>
Thu, 24 Oct 2013 13:05:19 +0000 (18:35 +0530)
commitecb408f6de83a9bf3c1f784bd220eb8dc92696a1
treead2c3829aafbdc6ad63bbfd69f6c4304c182c05b
parent3a2a98034ebb0a5d437b309056cacf31e4fc68a4
parent980ec4bc9ee99232087058526fc82dd4949c951c
[MERGE]Merge trunk-website-al.

bzr revid: bth@tinyerp.com-20131024130519-atsk50w40enrx85s