[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  telepathy-spec-treitter-trivial

Changes:

  Travis Reitter <travis.reitter at collabora.co.uk>
    correct-aliaseschanged-ref-in-setaliases.patch