Merge branch 'master' of github.com:inverse-inc/sogo

This commit is contained in:
Wolfgang Sourdeau
2012-09-26 11:50:34 -04:00