[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian-experimental, updated. debian/1%5.10.1-2-6-g7f91a15

[Simon McVittie]

The following commit has been merged in the debian-experimental branch:
commit cb5f6b33b925302ffbf417e3e4287161dbcd5010
Merge: d837c01c08a9a1fa669561ef59a6c67f0353131f fbdb7bdbc2b03401426e50a74a007f61631014c1
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Feb 21 19:58:54 2012 +0000

    Merge branch 'upstream-experimental' into debian-experimental
    
    Conflicts:
    	ChangeLog
    	NEWS
    	configure
    	configure.ac
    	data/Makefile.am
    	data/Makefile.in
    	doc/reference/mission-control-plugins/html/McpRequest.html
    	doc/reference/mission-control-plugins/html/ch01.html
    	doc/reference/mission-control-plugins/html/ch02.html
    	doc/reference/mission-control-plugins/html/ch03.html
    	doc/reference/mission-control-plugins/html/ch04.html
    	doc/reference/mission-control-plugins/html/mission-control-plugins-McpAccountStorage.html
    	doc/reference/mission-control-plugins/html/mission-control-plugins-McpDispatchOperationPolicy.html
    	doc/reference/mission-control-plugins/html/mission-control-plugins-McpRequestPolicy.html
    	ltmain.sh
    	m4/libtool.m4
    	m4/ltversion.m4
    	mission-control-plugins/loader.c
    	plugins/Makefile.in
    	server/Makefile.am
    	server/Makefile.in
    	src/Makefile.in
    	src/kludge-transport.c
    	src/mcd-account-compat.c
    	src/mcd-account-config.h
    	src/mcd-account-manager-sso.c
    	src/mcd-account-manager.c
    	src/mcd-account.c
    	src/mcd-account.h
    	src/mcd-connection.c
    	src/mcd-master.c
    	tests/Makefile.in
    	tests/twisted/Makefile.in
    	tests/twisted/account-manager/create-with-properties.py
    	tests/twisted/tools/Makefile.in
    	util/Makefile.am
    	util/Makefile.in
    	util/mc-tool.c


-- 
MC 5 packaging