pidgin/pidgin

pidgin/pidgin/
Merge with release-2.x.y

2014-11-05, Daniel Atallah
c6b248d98ba9