[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al
authorParamjit Singh Sahota <psa@tinyerp.com>
Wed, 14 Aug 2013 11:34:28 +0000 (17:04 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Wed, 14 Aug 2013 11:34:28 +0000 (17:04 +0530)
commit3a73cc94d26e3e14caeaa1c8b06b7383bbc527e3
treef3f8d4815ba2dcf229d39998b65fcd6ca9137577
parent1bbb2136b67f14cd67a08a71e30d586c72dfd178
parentf78d8e22e0d4d79f7ffd8574aac20b4ada3f998a
[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al

bzr revid: psa@tinyerp.com-20130814113428-6nb2rtn8zj703fl4