From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 21 Apr 2009 15:06:05 +0000 (+0100)
Subject: Merge branch 'tube-bus-name'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=4c140ad31a3b5a6b919f6acd8b6c79f9a8d3ab5f

Merge branch 'tube-bus-name'
---

4c140ad31a3b5a6b919f6acd8b6c79f9a8d3ab5f