[Pkg-telepathy-commits] [SCM] telepathy-gabble packaging branch, debian-experimental, updated. debian/0.15.3-1-8-g9a88641

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit 768ed7de6be3cd4e1e20284c109d9bc9de530a73
Merge: f9ef45839d3ec0723a096eea608041e7e0d8b983 031cfe18655fb55c410d09efa8f5d826e1d8d14d
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Feb 21 21:21:25 2012 +0000

    Merge tag 'upstream/0.15.4' into debian-experimental
    
    Upstream version 0.15.4
    
    Conflicts:
    	ChangeLog
    	NEWS
    	configure
    	configure.ac
    	gabble/connection.h
    	lib/ext/wocky/ChangeLog
    	lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html
    	lib/ext/wocky/docs/reference/html/WockyCapsCache.html
    	lib/ext/wocky/docs/reference/html/WockyContact.html
    	lib/ext/wocky/docs/reference/html/WockyNodeTree.html
    	lib/ext/wocky/docs/reference/html/WockyPubsubNode.html
    	lib/ext/wocky/docs/reference/html/WockyResourceContact.html
    	lib/ext/wocky/docs/reference/html/WockySession.html
    	lib/ext/wocky/docs/reference/html/api-index-full.html
    	lib/ext/wocky/docs/reference/html/ch01.html
    	lib/ext/wocky/docs/reference/html/wocky-Wocky-OpenSSL-TLS.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyNode.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyPing.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyPubsubService.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyRoster.html
    	lib/ext/wocky/docs/reference/html/wocky-WockySaslAuth.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-protected.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-protected.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-digest-md5.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html
    	lib/ext/wocky/tests/Makefile.in
    	lib/ext/wocky/wocky/wocky-c2s-porter.c
    	lib/ext/wocky/wocky/wocky-caps-hash.c
    	lib/ext/wocky/wocky/wocky-disco-identity.c
    	lib/ext/wocky/wocky/wocky-heartbeat-source.c
    	lib/ext/wocky/wocky/wocky-meta-porter.c
    	plugins/Makefile.in
    	src/Makefile.in
    	src/call-stream.c
    	src/conn-aliasing.c
    	src/connection.c
    	src/google-relay.c
    	src/muc-channel.c
    	src/protocol.c
    	tests/twisted/Makefile.in


-- 
telepathy-gabble packaging