[Telepathy] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

Changes:

  Thomas Zander <zander at kde.org>
    Fix address (FSF moved ages ago)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix FSF address in regression tests too