mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-08-25 08:23:28 +00:00
merge of '0c7a3586830c4d7e3ddd7bb0a43931475b8e83f2'
and '2cbf84f8b8523601758341cbc178cf538f0a6dee' Monotone-Parent: 0c7a3586830c4d7e3ddd7bb0a43931475b8e83f2 Monotone-Parent: 2cbf84f8b8523601758341cbc178cf538f0a6dee Monotone-Revision: 77fd2c6c49b1f4507e0f5be304a29a407392053a Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-05-04T21:37:39 Monotone-Branch: ca.inverse.sogo
This commit is contained in: