[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update NEWS with TpDBusPropertiesMixin changes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update NEWS with merged changes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update Channel.Interface.Group from telepathy-spec darcs to have correct added/deprecated annotations (a mistake in 0.17.6)