[MERGe] Merged lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth...
authorParamjit Singh Sahota <psa@tinyerp.com>
Mon, 26 Aug 2013 04:51:31 +0000 (10:21 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Mon, 26 Aug 2013 04:51:31 +0000 (10:21 +0530)
commit2e9463c66490871a62b39c9e52d1dfbdb065b840
tree5f18ab1aaf3f2c50816c83ccb44852c16c645281
parentbc9afa1e724e32864583db3ad76fc90f778cb69d
parent32b1bb5c1a36c0615a64837a11d08baa86a65ce1
[MERGe] Merged lp:~openerp-dev/openobject-addons/trunk-website-bootstrap-3.0-bth and removed conflicts.

bzr revid: psa@tinyerp.com-20130826045131-iuog4r9ijlilq3cv