telepathy-gabble: Merge branch '25961-stun-srv'

[Will Thompson]

Module: telepathy-gabble
Branch: master
Commit: de8905b5bb098c6f0468e9a2856006d1583ad80c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=de8905b5bb098c6f0468e9a2856006d1583ad80c

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Thu Dec  6 12:26:28 2012 +0000

Merge branch '25961-stun-srv'

https://bugs.freedesktop.org/show_bug.cgi?id=25961
https://bugs.freedesktop.org/show_bug.cgi?id=25385

---