pidgin/pidgin

pidgin/pidgin/
Fix merge issues from c3e87cb60c02

2014-10-03, Daniel Atallah
21ef99aa6390