From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 8 Nov 2010 12:39:22 +0000 (+0100)
Subject: Merge branch 'preset-581029'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=779b303df490ffa5a044b36c44777e2e0f24cf8c

Merge branch 'preset-581029'
---

779b303df490ffa5a044b36c44777e2e0f24cf8c