Oops, forget to merge this patch.
[auto] Merge from Mail

    • #b25d23b — Oops, forget to merge this patch. (Ivan Enderlin, 2013-04-23)

---

Merge remote branch 'library-mail/master'