Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.h @ 21871:91684de72a5c
merge of 'adb528a403db408f5e4407e89f98f7ced3cac9a1'
and 'da678e8fa88f2fe112926c0fabd070fda4d551f0'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Tue, 18 Dec 2007 16:10:22 +0000 |
parents | d20a1c190c2f |
children | eaaac273d80c 60f5abc6cf0c |