mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-07-17 06:14:54 +00:00
merge of '3c8f71698ed93ac4e9bac8ae36c7b17a9da18ca9'
and 'f0bf4f5e57bda2fe7cbbd558784c203b3fab4d36' Monotone-Parent: 3c8f71698ed93ac4e9bac8ae36c7b17a9da18ca9 Monotone-Parent: f0bf4f5e57bda2fe7cbbd558784c203b3fab4d36 Monotone-Revision: 2d256ad5de45712bf664154e503ef162f9780ce7 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-06-30T14:54:23 Monotone-Branch: ca.inverse.sogo
This commit is contained in: