pidgin/pidgin

Merge to default to fix conflicts

2016-10-24, Mike Ruprecht
6dc8cae57962
Merge to default to fix conflicts
EXTRA_DIST = Makefile.mingw
DIST_SUBDIRS = bonjour facebook gg irc jabber msn mxit novell null oscar sametime silc simple yahoo zephyr
SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)