Merge with trunk

author RGA(OpenERP) <>

Wed, 1 Aug 2012 12:30:35 +0000 (18:00 +0530)

committer RGA(OpenERP) <>

Wed, 1 Aug 2012 12:30:35 +0000 (18:00 +0530)
author RGA(OpenERP) <>
Wed, 1 Aug 2012 12:30:35 +0000 (18:00 +0530)
committer RGA(OpenERP) <>
Wed, 1 Aug 2012 12:30:35 +0000 (18:00 +0530)
diff --cc addons/account/account_view.xml
Simple merge
diff --cc addons/account_followup/account_followup_view.xml
Simple merge
diff --cc addons/account_voucher/__openerp__.py
Simple merge
diff --cc addons/account_voucher/account_voucher_view.xml
Simple merge
diff --cc addons/account_voucher/voucher_payment_receipt_view.xml
Simple merge
		1	2
addons/account/account_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account_followup/account_followup_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/__openerp__.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/account_voucher_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/account_voucher/voucher_payment_receipt_view.xml	patch \|	diff1 \|	diff2 \|	blob \| history