summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-05-20 21:41:44 -0400
committerLance Stout <lancestout@gmail.com>2011-05-20 21:41:44 -0400
commit9851a2a057aeee54300f703a39507713e7ad199a (patch)
tree76056226ae21cef996b24da69534abfa08249d29 /setup.py
parenta269be485f2918b332c9fa3717541fc0c6c954c2 (diff)
parent7152d93dd05346fdb7dbe1893bff6395f83a79a9 (diff)
downloadslixmpp-9851a2a057aeee54300f703a39507713e7ad199a.tar.gz
slixmpp-9851a2a057aeee54300f703a39507713e7ad199a.tar.bz2
slixmpp-9851a2a057aeee54300f703a39507713e7ad199a.tar.xz
slixmpp-9851a2a057aeee54300f703a39507713e7ad199a.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions