]> git.0d.be Git - empathy.git/commitdiff
projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 046792f 61de8fb)
Merge branch 'timestamp-615976'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 4 May 2010 12:20:15 +0000 (14:20 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 4 May 2010 12:20:15 +0000 (14:20 +0200)

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