From: Jonny Lamb <jonnylamb@gnome.org>
Date: Thu, 11 Mar 2010 11:35:45 +0000 (+0000)
Subject: Merge branch 'butterfly-conference-misc'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=02141c6718553ad9bf05afee05e1ef834d3bdd62;hp=-c

Merge branch 'butterfly-conference-misc'
---

02141c6718553ad9bf05afee05e1ef834d3bdd62