Merged pidgin/main into default
commitf09ec6ad8af30f0853e6f7ef480fc1bda1c867e8
authorArkadiy Illarionov <qarkai@gmail.com>
Sun, 28 May 2017 10:26:27 +0000 (28 13:26 +0300)
committerArkadiy Illarionov <qarkai@gmail.com>
Sun, 28 May 2017 10:26:27 +0000 (28 13:26 +0300)
tree38b119134b0db61ec26640975b39e0d654de916d
parent066a68e3018589c12aa378fa4c913a9e935aee36
parent3bc295b4af7760004443f1ca4988451de260255e
Merged pidgin/main into default
libpurple/buddyicon.c
libpurple/log.c