pidgin/pidgin

Merge release-2.x.y branch into master.

2014-11-04, Mark Doliner
fd55a0f119db
Merge release-2.x.y branch into master.

Minor manual merging in pidgin/gtkdialogs.c.
[Desktop Entry]
_Name=Pidgin Internet Messenger
_GenericName=Internet Messenger
_Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
Exec=pidgin
Icon=pidgin
StartupNotify=true
Terminal=false
Type=Application
Categories=Network;InstantMessaging;
@USES_MM_CHAT_SECTION@