From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 18 Jun 2010 16:11:58 +0000 (+0200)
Subject: Merge branch 'approvers-redone-599158'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=bfb75bb92f7e1a4aa93a9e144b781faf03df93eb

Merge branch 'approvers-redone-599158'
---

bfb75bb92f7e1a4aa93a9e144b781faf03df93eb