projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c236099 df99b53)
Merge remote-tracking branch 'gulic/buttons-668464'
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 13 Mar 2012 22:11:17 +0000 (09:11 +1100)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Tue, 13 Mar 2012 22:11:17 +0000 (09:11 +1100)

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