From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 10 Aug 2012 15:23:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'burton/aggregator'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=a5346f80e2d9b5f2fac7909e3688a6ae69d823a8;hp=-c

Merge remote-tracking branch 'burton/aggregator'
---

a5346f80e2d9b5f2fac7909e3688a6ae69d823a8