Merged pidgin/main into default
commit18db067512a58cc60e9229281497527d2d708d71
authorArkadiy Illarionov <qarkai@gmail.com>
Fri, 30 Jun 2017 12:03:16 +0000 (30 15:03 +0300)
committerArkadiy Illarionov <qarkai@gmail.com>
Fri, 30 Jun 2017 12:03:16 +0000 (30 15:03 +0300)
tree68cfbaaf3e42e523eeb1a9ee92e82097fa65d5eb
parent2621ef1c006a9436a3162db36394878d91971e9e
parent3901c4092086c0e7817be2943806a616b208d8e9
Merged pidgin/main into default