[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>
    Prepend "in_" to the names of named "in" arguments, to avoid arguments called "errno" causing havoc (thanks, MediaStreamHandler)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Tidy documentation sections: put dbus and proxy in a new "General D-Bus support" section, and add media-interfaces

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpGroupMixin: silently map NULL message to ""

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpGroupMixin: document that NULL TpIntSets in tp_group_mixin_change_members are silently mapped to empty sets