summaryrefslogtreecommitdiff
path: root/sleekxmpp/features/feature_session/__init__.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-01-18 15:34:49 -0800
committerLance Stout <lancestout@gmail.com>2012-01-18 15:34:49 -0800
commitbd85e9539850f691f39994ade126ccd73371f61d (patch)
tree8d2199f4b52d3a842a532cd5659590ca5a75ced4 /sleekxmpp/features/feature_session/__init__.py
parent22cc194ed878ac00715951605dcdee51eb313f1b (diff)
downloadslixmpp-bd85e9539850f691f39994ade126ccd73371f61d.tar.gz
slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.tar.bz2
slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.tar.xz
slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.zip
Gah, too many branch conflicts.
Diffstat (limited to 'sleekxmpp/features/feature_session/__init__.py')
0 files changed, 0 insertions, 0 deletions