]> git.0d.be Git - empathy.git/commit
Merge branch 'conference-tp-glib-630709'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 29 Sep 2010 15:37:26 +0000 (17:37 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 29 Sep 2010 15:37:26 +0000 (17:37 +0200)
commitb68e00fd8bba2dec6140eaa45be99f3cf9e8287b
treec0fade5f8ad2e0f9d505e94b4674825cf388ac2c
parentf83fcfb28e6cf8d3f2ba31dddebc597eac934dae
parent204eecf6dd4fc8da63f3f82e93af1ffa72836583
Merge branch 'conference-tp-glib-630709'