Ludovic Marcotte 68b99f2f28 Fixed merge ... Monotone-Parent: 24936b7a90184df1eebd3fa1c0df81c4dcbb2751 Monotone-Revision: f2612a8cd144efc05fbd0847e973f12e72643c9b Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-01-26T16:27:18 Monotone-Branch: ca.inverse.sogo		2012-01-26 16:27:18 +00:00
..
Appointments	See ChangeLog.	2012-01-13 17:20:58 +00:00
Contacts	propagate from branch 'ca.inverse.sogo.1_3_12' (head c241a8e1e716fa0db3e4f4e370c051096cc2c3e2)	2012-01-12 21:01:06 +00:00
Mailer	Updated Ukrainian translation.	2011-12-19 18:52:06 +00:00
SOGo	Fixed merge	2012-01-26 16:27:18 +00:00
common.make	Monotone-Parent: ee4ff9bf4febdfd103bba6fa3403eb4d6bf3023b	2011-03-30 14:44:47 +00:00
GNUmakefile	See ChangeLog	2009-10-09 21:54:07 +00:00