diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-06-14 14:10:52 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-06-14 14:10:52 -0700 |
| commit | 5d11ab269d721a6360420798cfa5243e63bf8013 (patch) | |
| tree | f1451e12b8ed7fe6787ad6aedd902f09ec6cba42 /setup.py | |
| parent | 7a60e4b458ed58f2a130f5da24ad36bf62426329 (diff) | |
| parent | dd41a85efcd85bb3a4eb81187041106c65c6aa2d (diff) | |
| download | slixmpp-5d11ab269d721a6360420798cfa5243e63bf8013.tar.gz slixmpp-5d11ab269d721a6360420798cfa5243e63bf8013.tar.bz2 slixmpp-5d11ab269d721a6360420798cfa5243e63bf8013.tar.xz slixmpp-5d11ab269d721a6360420798cfa5243e63bf8013.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions