[MERGE] Merged from openobject-addons.
authorJiten (OpenERP) <jra@tinyerp.com>
Mon, 9 Jul 2012 09:37:06 +0000 (15:07 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Mon, 9 Jul 2012 09:37:06 +0000 (15:07 +0530)
commit889cdb96c5c7b9c6e953a72dbb1d73b2309a15eb
tree4f74e20d3d7568d65887e05c1a1343fb76eb5880
parent957f2e5cf4ebf9bc4573ddaf558638683c4fa06e
parente9c288b4bf9b82e505ee94a44b5c0e5dfd1f45f8
[MERGE] Merged from openobject-addons.

bzr revid: jra@tinyerp.com-20120709093706-82g4gkst6lq8dynv