[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/smcv/public_html/darcs/telepathy-spec-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Avatars: document that a maximum image size of 0 means unlimited

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Avatars: update Collabora copyright to 2005-2007