[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/alban/public_html/darcs/telepathy-salut-alban-copyright

Changes:

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix copyright