]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51cb135 923c077)
Merge remote branch 'cosimoc/tls-multireject' into conference
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Sep 2010 19:38:50 +0000 (20:38 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 13 Sep 2010 19:38:50 +0000 (20:38 +0100)

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