pidgin/pidgin

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

2014-06-17, Tomasz Wasilczyk
747e73eab859