[MERGE] Merge with lp:openobject-addons
authorSbh (Openerp) <sbh@tinyerp.com>
Wed, 27 Jun 2012 06:28:51 +0000 (11:58 +0530)
committerSbh (Openerp) <sbh@tinyerp.com>
Wed, 27 Jun 2012 06:28:51 +0000 (11:58 +0530)
bzr revid: sbh@tinyerp.com-20120627062851-fvhfzwhsry6py9vc

1  2 
addons/portal/wizard/portal_wizard.py

Simple merge