Merge remote-tracking branch 'odoo/7.0' into 7.0
authorOCA git bot <OCA-git-bot@therp.nl>
Mon, 10 Nov 2014 22:42:38 +0000 (23:42 +0100)
committerOCA git bot <OCA-git-bot@therp.nl>
Mon, 10 Nov 2014 22:42:38 +0000 (23:42 +0100)
commit633832aa6e17c8b14428b204e3df68074e777db4
tree0fcd0e7d88abe4043ce11796890bf5c4d5be19dd
parentfccea9a09209c1a4b28b8fb92cf9e3a04f8fe2df
parentab5ecef476b82c7e00dbd1868de19832ac044f15
Merge remote-tracking branch 'odoo/7.0' into 7.0
addons/mrp/mrp.py
addons/project_timesheet/project_timesheet.py