pidgin/pidgin

Merge pidgin/main branch release-2.x.y into private/main branch release-2.x.y.
release-2.x.y
2014-05-04, Mark Doliner
be8209a19937
Merge pidgin/main branch release-2.x.y into private/main branch release-2.x.y.
Only one file with conflicts: ChangeLog.
installed_m4=purple.m4
EXTRA_DIST=$(installed_m4)
m4datadir=$(datadir)/aclocal
m4data_DATA=$(installed_m4)