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
This commit is contained in:
Ludovic Marcotte 2011-06-29 17:44:03 +00:00
parent 613dc575df
commit dd3704d265

View file

@ -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.