[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Nano version 0.7.12.1