From: Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Date: Thu, 25 Jun 2009 18:06:26 +0000 (-0400)
Subject: Merge branch 'fix-prefs'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=764e70b98c1b657e87b349c1f220903a78eb4065

Merge branch 'fix-prefs'
---

764e70b98c1b657e87b349c1f220903a78eb4065