Merge with oscar_auth

Thu, 06 Oct 2016 10:07:59 -0400

author
Daniel Atallah <datallah@pidgin.im>
date
Thu, 06 Oct 2016 10:07:59 -0400
changeset 38116
986c584839d0
parent 38115
3642732f538e (current diff)
parent 38096
16a23b25545d (diff)
child 38117
53be66561f8d

Merge with oscar_auth

mercurial