]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 2f64117 65d0f64)
Merge branch 'fix-prefs'
authorPierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Thu, 25 Jun 2009 18:06:26 +0000 (14:06 -0400)
committerPierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>
Thu, 25 Jun 2009 18:06:26 +0000 (14:06 -0400)

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