[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/robot101/public_html/telepathy-gabble-rob

Changes:

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    tweak set status test to store the presence dbus.Interface in the data dict, for reuse

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    add test case to set status test which calls SetStatus with available and no optional arguments

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    tweak indentation

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    correct tests/README to actually be correct

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    correct readme for tests to have run-with-tmp-session-bus.sh instead of run-with-tmp-session-bus.py

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    make set_own_status function safe against the status having NULL optional_arguments

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    update set status test to new @match format