pidgin/pidgin

Pull changes from ssh://hg@hg.pidgin.im/pidgin/main
release-2.x.y
2014-06-17, Mark Doliner
c4ebf4d738f9
Pull changes from ssh://hg@hg.pidgin.im/pidgin/main
Easy manual merge: Only conflicts were in ChangeLog.
[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@