merge upstream
authorChristophe Simonis <chs@openerp.com>
Wed, 14 Dec 2011 11:27:12 +0000 (12:27 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 14 Dec 2011 11:27:12 +0000 (12:27 +0100)
bzr revid: chs@openerp.com-20111214112712-wg6r5bhehcau701o

1  2 
addons/share/wizard/share_wizard.py

Simple merge