[MERGE] lp:openobject-addons
authorKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Fri, 29 Jun 2012 05:03:35 +0000 (10:33 +0530)
committerKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Fri, 29 Jun 2012 05:03:35 +0000 (10:33 +0530)
commit7e086d1d4fec67814145c85943e0f58caca5b485
tree35c007a6efbff20a653a4693124b0dca300675cc
parentbec0f4fca2666d64a681075556cdc4df6e8a2b13
parent3c6d5dabfb10938ef3b7135d0b3565ff962ce6ae
[MERGE] lp:openobject-addons

bzr revid: kjo@tinyerp.com-20120629050335-t3iphlwje9lfibam