pidgin/pidgin

Merge 2.x.y

2014-11-06, Tomasz Wasilczyk
09478bc2e043
Merge 2.x.y
--- a/po/POTFILES.in Wed Nov 05 14:02:06 2014 -0500
+++ b/po/POTFILES.in Thu Nov 06 15:15:12 2014 +0100
@@ -79,6 +79,7 @@
libpurple/plugins/psychic.c
libpurple/plugins/signals-test.c
libpurple/plugins/simple.c
+libpurple/plugins/ssl/nss-prefs.c
libpurple/plugins/ssl/ssl-gnutls.c
libpurple/plugins/ssl/ssl-nss.c
libpurple/plugins/ssl/ssl.c