[MERGE] Merge with lp:openobject-addons
authorSbh (Openerp) <sbh@tinyerp.com>
Thu, 24 May 2012 09:59:42 +0000 (15:29 +0530)
committerSbh (Openerp) <sbh@tinyerp.com>
Thu, 24 May 2012 09:59:42 +0000 (15:29 +0530)
commit450641ecad8a1bf8663664042435ba698c8b2c1d
treede1bf956aa1fdd2580ce355b1e9f97e9851bb2ab
parent002934cf197f7ebf1479d5ff85cb91dfdc03cadd
parent25d0c8057e72d8e0149fb54d11cfe95c82b85dd0
[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20120524095942-1vi68e0lubcq8tg4