/pidgin/main: c6b894d730dd: Merge

[Daniel Atallah]

Changeset: c6b894d730dd68a2ce2b840080b7e3b225426f7c
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2014-01-21 23:12 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/c6b894d730dd

Description:

Merge

diffstat:

 ChangeLog      |  2 +-
 po/POTFILES.in |  1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diffs (21 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.10.8:
+version 2.10.8 (1/28/2014):
 	General:
 	* Python build scripts and example plugins are now compatible with
 	  Python 3. (Ashish Gupta) (#15624)
diff --git a/po/POTFILES.in b/po/POTFILES.in
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -261,5 +261,6 @@ pidgin/plugins/timestamp_format.c
 pidgin/plugins/vvconfig.c
 pidgin/plugins/win32/transparency/win2ktrans.c
 pidgin/plugins/win32/winprefs/winprefs.c
+pidgin/plugins/unity.c
 pidgin/plugins/xmppconsole.c
 pidgin/win32/nsis/nsis_translations.desktop.in