From dd3704d26566452d5aa7256e0dad5fc471f9c59f Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 29 Jun 2011 17:44:03 +0000
Subject: [PATCH] fixed merge

Monotone-Parent: 19d6588c4dfb7220f7b5d02e619c02259029cabb
Monotone-Revision: c395dc55e24320e5a7a74fe51cd8a5b61e1c8f68

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-06-29T17:44:03
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fbb20bf1e..96628b14a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2011-06-29  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
-	* Added get/set/unset capabilities to sogo-tool to set
+        * Added get/set/unset capabilities to sogo-tool to set
 	user's defaults/settings. Refactored some code to be
 	more cleanly structured.