Merged pidgin/main into default

2016-10-30, Arkadiy Illarionov