telepathy-salut: Merge branch 'telepathy-salut-0.8'

[Will Thompson]

Module: telepathy-salut
Branch: master
Commit: 0195745c3e1516a4e5c694768b64941093f34719
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=0195745c3e1516a4e5c694768b64941093f34719

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Fri Nov 16 15:56:12 2012 +0000

Merge branch 'telepathy-salut-0.8'

This updates the Wocky snapshot to include the stanza namespace fixes.
They don't seem to cause any problems.

Conflicts:
	NEWS
	configure.ac
	lib/ext/wocky
	src/tubes-channel.c

---