pidgin/pidgin

pidgin/pidgin/
Manual merge for 07e827917960

2014-01-29, Tomasz Wasilczyk
056b8468d470