[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 22 Sep 2011 09:12:49 +0000 (14:42 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 22 Sep 2011 09:12:49 +0000 (14:42 +0530)
commit4b7f5b73a61a59048d690ef99d1d918d384ad300
treef621604b62d635629974f4900eeff8865d0dcddc
parentb66ca8252eeee30df9722c857b6e79296106bf05
parentef4795dbe6637893fdf627ddd5e15ae6e8be1983
[MERGE]: Merge with lp:openobject-addons

bzr revid: mma@tinyerp.com-20110922091249-qlx9jubz52izvifr