diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-06-20 16:27:55 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-06-20 16:27:55 -0700 |
| commit | fa716457a5cc8abf207e1da903202398dfb26878 (patch) | |
| tree | cb10108eb4d19c30387fc22c5d53a96e3f80431f /setup.py | |
| parent | 4efd41f1ba679348487e1e88b7426830e92a9f9b (diff) | |
| parent | d8d9e8df16c07bd13bbac72e4445a2930407b244 (diff) | |
| download | slixmpp-fa716457a5cc8abf207e1da903202398dfb26878.tar.gz slixmpp-fa716457a5cc8abf207e1da903202398dfb26878.tar.bz2 slixmpp-fa716457a5cc8abf207e1da903202398dfb26878.tar.xz slixmpp-fa716457a5cc8abf207e1da903202398dfb26878.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions