[empathy: 12/12] Merge remote-tracking branch 'burton/aggregator'

[Guillaume Desmottes <gdesmott src gnome org>]

commit a5346f80e2d9b5f2fac7909e3688a6ae69d823a8
Merge: 53257c1 91186e9
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Aug 10 17:23:52 2012 +0200

    Merge remote-tracking branch 'burton/aggregator'

 libempathy-gtk/Makefile.am                         |    2 +
 libempathy-gtk/empathy-roster-model-aggregator.c   |  425 ++++++++++++++++++++
 libempathy-gtk/empathy-roster-model-aggregator.h   |   93 +++++
 tests/interactive/Makefile.am                      |    4 +-
 .../test-empathy-roster-model-aggregator.c         |  164 ++++++++
 5 files changed, 687 insertions(+), 1 deletions(-)
---