pidgin/pidgin

pidgin/pidgin/
Merge heads.
release-2.x.y
2014-11-15, Elliott Sales de Andrade
78abe6e4a789