From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 27 Apr 2009 10:16:38 +0000 (+0100)
Subject: Merge branch 'tp-tube'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=ebfb5e83604b4a48482e3126e5797f05ff99b3b1;hp=-c

Merge branch 'tp-tube'
---

ebfb5e83604b4a48482e3126e5797f05ff99b3b1