projects / empathy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ca3b29 a976f81)
Merge branch 'folks-async-and-prepare'
authorTravis Reitter <treitter@gmail.com>
Tue, 27 Jul 2010 10:54:06 +0000 (12:54 +0200)
committerTravis Reitter <treitter@gmail.com>
Tue, 27 Jul 2010 10:54:06 +0000 (12:54 +0200)

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