Replace trunk with sogo-good branch
authorJulien Kerihuel <j.kerihuel@openchange.org>
Fri, 24 Feb 2012 12:29:00 +0000 (12:29 +0000)
committerJulien Kerihuel <j.kerihuel@openchange.org>
Fri, 24 Feb 2012 12:29:00 +0000 (12:29 +0000)

Trivial merge