[Telepathy] 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>
    Don't say that the aliasing interface can't change unique identifier - we've concluded that on IRC, it probably should

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    telepathy-spec 0.15.3

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Assert that aliases should be used as the displayed name

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Redefine the meaning of CONNECTION_ALIAS_FLAG_USER_SET so it doesn't apply to channel-specific handles, and doesn't exclude the possibility that aliases can be set by the remote contact too.
The former is for future improvement to Gabble, and the latter matches its
current behaviour.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Bump version to 0.15.3.1

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Increment version to 0.15.3