[MERGE] lp:openobject-addons
authorJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 22 Nov 2011 06:09:58 +0000 (11:39 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 22 Nov 2011 06:09:58 +0000 (11:39 +0530)
commit24abb4e2f8ce3f2cf67d15f83a0377379e6737a9
treef3f489e522299a3b0e2d813885cc8ccf1aab9c1f
parentf3db0978a29289394c0321925544f5c7d2df4a38
parent0e8b9138423513343f0eae5a3b5c35f60c664569
[MERGE] lp:openobject-addons

bzr revid: jam@tinyerp.com-20111122060958-q4ja25q4f1qkl3dg