]> git.0d.be Git - empathy.git/commit
Merge branch 'trivia'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 15 Nov 2010 13:44:35 +0000 (14:44 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 15 Nov 2010 13:44:35 +0000 (14:44 +0100)
commit750f7705fe5d58f2c13a57d5e3c844aa0f205e10
treed44ea16041cc53b78c910df58d81c02c0cf868ab
parent4a8508f3b3a0c595add6908188a9a3e9c46c509a
parent1332eb95a91fb7e4f001757f702e79002ad3aebc
Merge branch 'trivia'