pidgin/pidgin

Merge release-2.x.y branch into master. No overlapping files.

2014-11-04, Mark Doliner
c84a673e6105
Merge release-2.x.y branch into master. No overlapping files.
installed_m4=purple.m4
EXTRA_DIST=$(installed_m4) as-ac-expand.m4
m4datadir=$(datadir)/aclocal
m4data_DATA=$(installed_m4)