Merged pidgin/main into default
commit066a68e3018589c12aa378fa4c913a9e935aee36
authorArkadiy Illarionov <qarkai@gmail.com>
Thu, 23 Mar 2017 16:11:37 +0000 (23 19:11 +0300)
committerArkadiy Illarionov <qarkai@gmail.com>
Thu, 23 Mar 2017 16:11:37 +0000 (23 19:11 +0300)
tree373abb6369433a70d6bc3e3b826cc3901a202eef
parent6588b6472acb19e7a92909d3c0536a339ab64aee
parentb7e056311e23a9e79ca154d3023df8b617b9d034
Merged pidgin/main into default