diff options
author | Lance Stout <lancestout@gmail.com> | 2011-03-24 13:15:00 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-03-24 13:15:00 -0400 |
commit | 77601f7262370ba172966352a94575ec02b4a776 (patch) | |
tree | 94d4db4e2718d6c919c3fbd6ad0bd4f5f1e53566 /ez_setup.py | |
parent | d9be51b2efcdaaf6b62488700eb3ce859bb0958a (diff) | |
parent | d94811d81d68d948155d42ff9096c23ccb90a73c (diff) | |
download | slixmpp-77601f7262370ba172966352a94575ec02b4a776.tar.gz slixmpp-77601f7262370ba172966352a94575ec02b4a776.tar.bz2 slixmpp-77601f7262370ba172966352a94575ec02b4a776.tar.xz slixmpp-77601f7262370ba172966352a94575ec02b4a776.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'ez_setup.py')
0 files changed, 0 insertions, 0 deletions