summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorLance Stout <lance@misbehave.local>2011-05-25 15:53:24 -0700
committerLance Stout <lance@misbehave.local>2011-05-25 15:53:24 -0700
commit62bdaab7c7fc5a35c83ac9f3b0bf5b393f0eb925 (patch)
treec1df1303591fc3130112a18d791a54d9fff25a29 /sleekxmpp/plugins
parentbb2bc64d15fd33b66193326554b67e9f71d6f90f (diff)
parentec9aed5b751cac187b774794c7d8ca9de298838a (diff)
downloadslixmpp-62bdaab7c7fc5a35c83ac9f3b0bf5b393f0eb925.tar.gz
slixmpp-62bdaab7c7fc5a35c83ac9f3b0bf5b393f0eb925.tar.bz2
slixmpp-62bdaab7c7fc5a35c83ac9f3b0bf5b393f0eb925.tar.xz
slixmpp-62bdaab7c7fc5a35c83ac9f3b0bf5b393f0eb925.zip
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/plugins')
0 files changed, 0 insertions, 0 deletions