Merge remote-tracking branch 'odoo/7.0' into 7.0 7.0_community
authorOCA git bot <OCA-git-bot@therp.nl>
Tue, 25 Nov 2014 22:42:43 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Tue, 25 Nov 2014 22:42:43 +0000 (23:42 +0100)
1  2 
addons/account/account_invoice.py
addons/project_timesheet/project_timesheet.py

Simple merge