Merge branch 'tls-connection'

author Cosimo Cecchi <cosimoc@gnome.org>

Tue, 24 Aug 2010 13:24:38 +0000 (15:24 +0200)

committer Cosimo Cecchi <cosimoc@gnome.org>

Tue, 24 Aug 2010 13:24:38 +0000 (15:24 +0200)
author Cosimo Cecchi <cosimoc@gnome.org>
Tue, 24 Aug 2010 13:24:38 +0000 (15:24 +0200)
committer Cosimo Cecchi <cosimoc@gnome.org>
Tue, 24 Aug 2010 13:24:38 +0000 (15:24 +0200)
diff --cc configure.ac
Simple merge
diff --cc libempathy-gtk/Makefile.am
Simple merge
diff --cc po/POTFILES.in
Simple merge
author	Cosimo Cecchi <cosimoc@gnome.org>
	Tue, 24 Aug 2010 13:24:38 +0000 (15:24 +0200)
committer	Cosimo Cecchi <cosimoc@gnome.org>
	Tue, 24 Aug 2010 13:24:38 +0000 (15:24 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
po/POTFILES.in	patch \|	diff1 \|	diff2 \|	blob \| history