[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Mon, 8 Oct 2012 05:04:59 +0000 (10:34 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Mon, 8 Oct 2012 05:04:59 +0000 (10:34 +0530)
bzr revid: cha@tinyerp.com-20121005051643-sdqj92jh7vt77ysn
bzr revid: cha@tinyerp.com-20121008050459-2dv1fz23tubmp1qz


Trivial merge