merge of 'b0c7b4b626567d13058b5a3e35a0d9854a4459eb'

and 'c7e5e47c096416ee9cd8e6c7c86cab9483739027'

Monotone-Parent: b0c7b4b626567d13058b5a3e35a0d9854a4459eb
Monotone-Parent: c7e5e47c096416ee9cd8e6c7c86cab9483739027
Monotone-Revision: 063d3ecd7926ad37de863baa4d97b7dc9fac9283

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-06-14T13:15:51
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-06-14 13:15:51 +00:00

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB