Merge branch 'master' into tp-tube
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 24 Apr 2009 15:28:22 +0000 (16:28 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 24 Apr 2009 15:28:22 +0000 (16:28 +0100)
commitf02d96379cb7043611d093921755d699e48689bb
tree4a7cb101ebe4295306f17f12f805e4672c30bff6
parentc8d23985b7754541cab512992294c19f5c87cfaa
parentd696d6cc31f672884382d5b8949be504cdc718a5
Merge branch 'master' into tp-tube
libempathy/empathy-tp-tube.c