Wed, 01 Jan 2014 11:16:13 +0530
Merged default branch
--- a/.hgignore Wed Jan 01 11:11:59 2014 +0530 +++ b/.hgignore Wed Jan 01 11:16:13 2014 +0530 @@ -111,6 +111,7 @@ pidgin-.*.tar.gz pidgin.apspec$ pidgin.desktop$ +pidgin.desktop.in$ pidgin.spec$ pidgin/.*\.html\.h$ pidgin/pidgin$