pidgin/pidgin

Merge with replace-nm-with-gio

2016-10-06, Daniel Atallah
e977e0bdd5fd
Merge with replace-nm-with-gio