]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea2be64 51e36d3)
Merge branch 'moblin'
authorCosimo Cecchi <cosimoc@gnome.org>
Mon, 28 Sep 2009 14:39:59 +0000 (16:39 +0200)
committerCosimo Cecchi <cosimoc@gnome.org>
Mon, 28 Sep 2009 14:39:59 +0000 (16:39 +0200)
Conflicts:
libempathy-gtk/empathy-account-widget.c


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