pidgin/pidgin

Merge with release-2.x.y

2014-11-13, Elliott Sales de Andrade
a728314b1306
Merge with release-2.x.y