~mrb/openerp-extra/7.0-caldav-fixes-2012103101

Viewing all changes in revision 316.

  • Committer: Olivier Dony
  • Date: 2012-08-07 09:38:02 UTC
  • mfrom: (303.8.7 trunk)
  • Revision ID: odo@openerp.com-20120807093802-u30g8vszx03zaqv9
[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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: