Renames a variable to avoid confusion.
Make sure that the COLIBRI namespace is used for 'payload-type' children of
COLIBRI 'channel' elements.

This is to fix an issue where in certain cases a Jingle namespace was used, and
the resulting 'conference' IQs would confuse the videobridge.
Makes sure that the video content is reinitialized in
CallPeerJabberImpl#sendModifyVideoContent(), even if no change to the jingle
session direction is introduced. Fixes a problem with local video not being
enabled on the focus of a conference if the jingle sessions are already setup
with senders=both.
Adds additional debug/error information output in the Windows Audio Session API (WASAPI) integration.
Updates the global shortcut library for Mac OS X with a version compiled on 10.6
Corrects DNS cache issue when testing DNS connectivity.
Merge branch 'failoverConnectionMonitor'
Corrects unresolved import due to missing static link for MsOutlook plugin.
Merge branch 'master' of https://github.com/jitsi/jitsi
Merge branch 'master' of git://github.com/jitsi/jitsi