pidgin/pidgin

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

2014-11-07, Daniel Atallah
3b264e3c6710