merge of '150562a6cebe155a4cb327810609cda6bf2fb935'

and 'bf9cc230b574a121a65dec376056ef21db5478d1'

Monotone-Parent: 150562a6cebe155a4cb327810609cda6bf2fb935
Monotone-Parent: bf9cc230b574a121a65dec376056ef21db5478d1
Monotone-Revision: aa694c23977599cbef19c8530654ec14bd0d7a86

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-09-21T22:38:17
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-09-21 22:38:17 +00:00

Diff Content Not Available