[Telepathy-commits] merge: telepathy-python

[Merge Monkey]

Merge to:

  telepathy-python

From:

  /home/smcv/public_html/darcs/telepathy-python-smcv

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add chatroom example