[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/smcv/public_html/darcs/tp-spec-smcv-accountmanager

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Merge conflict with change annotations inAccount

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove Avatar property from core Account interface, so clients can call GetAll for properties without flooding the bus with avatars

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add Account_Interface_Avatar

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add <tp:added>, <tp:changed> for Account.Interface.Avatar