merge of '66579c760e295ff673528237f7a3497509335c5b'

and '757818bcf28a80dc4ced3f18d49bf9499207ebd8'

Monotone-Parent: 66579c760e295ff673528237f7a3497509335c5b
Monotone-Parent: 757818bcf28a80dc4ced3f18d49bf9499207ebd8
Monotone-Revision: 84f16af60b24272574dd4cda1e264912e25d3f4e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-29T15:49:00
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-10-29 15:49:00 +00:00

Diff Content Not Available