[MERGE] Merging
authorpso (OpenERP) <pso@tinyerp.com>
Tue, 2 Aug 2011 12:18:44 +0000 (17:48 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Tue, 2 Aug 2011 12:18:44 +0000 (17:48 +0530)
bzr revid: pso@tinyerp.com-20110802121844-78gx4iva3hh6yeg7

1  2 
addons/account/account.py
addons/account_voucher/account_voucher.py

Simple merge