pidgin/pidgin

pidgin/pidgin/m4macros/
Manual merge pidgin/main into private/main.

2014-05-04, Mark Doliner
c3cad56ac8b9