From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 23 Apr 2009 16:44:50 +0000 (+0100)
Subject: Merge branch 'send-video-576394'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=055e2787d98e48a51eb4345c6e375776ec615072

Merge branch 'send-video-576394'
---

055e2787d98e48a51eb4345c6e375776ec615072