merge
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 19 Aug 2010 10:07:27 +0000 (12:07 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 19 Aug 2010 10:07:27 +0000 (12:07 +0200)
bzr revid: fp@tinyerp.com-20100819100727-zf511agg8z9718tg

1  2 
addons/account_voucher/voucher.py

Simple merge