[MERGE] Merged with main addons
authorThibault Delavallée <tde@openerp.com>
Wed, 15 Feb 2012 13:48:40 +0000 (14:48 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 15 Feb 2012 13:48:40 +0000 (14:48 +0100)
commita6948dada7cded05277afeab97f5bd5823d79597
tree66a75399e54f35536fb8100e1feee568d088459d
parent5d91ea1e675490dff590d52f3a8ea15d481f51d2
parentd8a6fa3b4003a58a93fd7c6e2b43095a6985b455
[MERGE] Merged with main addons

bzr revid: tde@openerp.com-20120215134840-yaohsrb50crhjr90
addons/project/project.py