summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorThom Nichols <tmnichols@gmail.com>2010-06-02 14:18:46 -0400
committerThom Nichols <tmnichols@gmail.com>2010-06-02 14:18:46 -0400
commit1f3cfb98f155511bc10d9630534e39adaa50feae (patch)
tree9a3ef6f75987868e0c84dc64b376025e3395b19c /sleekxmpp/xmlstream
parent4295a66c70e595d02e14f384432d8eee8dfef013 (diff)
parent85a2715c7de1f436b5553a73f74c30cffa8bc04f (diff)
downloadslixmpp-1f3cfb98f155511bc10d9630534e39adaa50feae.tar.gz
slixmpp-1f3cfb98f155511bc10d9630534e39adaa50feae.tar.bz2
slixmpp-1f3cfb98f155511bc10d9630534e39adaa50feae.tar.xz
slixmpp-1f3cfb98f155511bc10d9630534e39adaa50feae.zip
Merge branch 'master' into hacks
Diffstat (limited to 'sleekxmpp/xmlstream')
0 files changed, 0 insertions, 0 deletions