[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix sh syntax and not-always-regenerated code in examples/extensions/Makefile.am

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix sh syntax and not-always-regenerated code in telepathy-glib/Makefile.am

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Debug on apparently-invalid Connection bus names

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    If protocol name in a bus name is e.g. "local_xmpp", map it back to "local-xmpp" in tp_list_connection_names_helper. fd.o#14667