-
Committer:
Olivier Dony
-
Date:
2012-08-07 09:38:02 UTC
-
mfrom:
(66.8.5 trunk)
-
Revision ID:
odo@openerp.com-20120807093802-c8ehwm51ktsaypnk
[MERGE] mail.alias implementation + mrp.repair improvement + placeholders review + misc bits
Attempt to fix previous fp-style merge breaking weeks
of history. Unfortunately this one will swallow a few
extra merges on top of the mail.alias merge, as well
as a few odd commits