From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 24 Apr 2009 15:28:22 +0000 (+0100)
Subject: Merge branch 'master' into tp-tube
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=f02d96379cb7043611d093921755d699e48689bb

Merge branch 'master' into tp-tube
---

f02d96379cb7043611d093921755d699e48689bb