Merge to: telepathy-sofiasip From: /home/sjoerd/telepathy-sofiasip-sjoerd Changes: Sjoerd Simons <sjoerd at luon.net> Override channel-type and object-path properties instead of redefining them