[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-crm-shp
authorTejas Tank <tta@openerp.com>
Tue, 27 Nov 2012 09:46:23 +0000 (15:16 +0530)
committerTejas Tank <tta@openerp.com>
Tue, 27 Nov 2012 09:46:23 +0000 (15:16 +0530)
commit2a490dbb68f16d9372d3ebcff41ddd1ff2fff8d8
tree82603d54df406cf694bbc4f4e571952a6f15aa4b
parent45993b0e14aa423650368a15340a744dec63e3f8
parent3457eb9784d222b93017f35847bc44294a451367
[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-crm-shp

bzr revid: tta@openerp.com-20121127094623-pu104k6uobuwgtvn