merge of '51381931f3aace686a6d1f39fd9e8ff37174e41c'

and 'dc7f4b5bfd6f1e20c6244c01ec2af24c5f5baba3'

Monotone-Parent: 51381931f3aace686a6d1f39fd9e8ff37174e41c
Monotone-Parent: dc7f4b5bfd6f1e20c6244c01ec2af24c5f5baba3
Monotone-Revision: faa665d09f8735444e5cc6f1e0ca073851cbab3f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-03T13:41:24
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2011-11-03 13:41:24 +00:00
commit d02400dfc1

Diff content is not available