merge of '181c204ddec5a60db59ce4a63428f75cb20a7a81'

and '711719c8f61430104774de2c64f475461e66414d'

Monotone-Parent: 181c204ddec5a60db59ce4a63428f75cb20a7a81
Monotone-Parent: 711719c8f61430104774de2c64f475461e66414d
Monotone-Revision: b9e528a27e01ed03f230f04af5fbb3e72756f192

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-16T20:19:10
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-01-16 20:19:10 +00:00

Diff Content Not Available