projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53257c1 91186e9)
Merge remote-tracking branch 'burton/aggregator'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 10 Aug 2012 15:23:52 +0000 (17:23 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 10 Aug 2012 15:23:52 +0000 (17:23 +0200)

Trivial merge
Fork of git.gnome.org/browse/empathy (was not supposed to be merged)