[MERGE] lp:openobject-addons
authorJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 18 Jul 2012 08:35:51 +0000 (14:05 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 18 Jul 2012 08:35:51 +0000 (14:05 +0530)
commitf5a023fd00835b437f9298125dd15e7bf1a0c1f2
tree2835cbd72e8651734b69000b18438b2f0843bfdf
parent3e5414bee978164f1222f82d53877e3daabbddb4
parent2a89c6079c9f7f5d9135bcda777fda3f3ed8d859
[MERGE] lp:openobject-addons

bzr revid: jam@tinyerp.com-20120718083551-f6288gz1ibhqsgns