[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/sjoerd/telepathy-sofiasip-no-overrides

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Don't override GetParameters and ListProtocols. tp-glibs base connection manager handles these just fine