diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-07-27 19:35:42 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-07-27 19:35:42 -0700 |
| commit | ad978700fc891602c826dea03615c396f39364a0 (patch) | |
| tree | 76315f3d39cd7209c71a164864f5e815d1a27d07 /setup.py | |
| parent | 48fb7006f75dd03caa23f61cb512f9002fe91b90 (diff) | |
| parent | e022b2a36c342b6a83d7c7f0a39dfb851cdfd2de (diff) | |
| download | slixmpp-ad978700fc891602c826dea03615c396f39364a0.tar.gz slixmpp-ad978700fc891602c826dea03615c396f39364a0.tar.bz2 slixmpp-ad978700fc891602c826dea03615c396f39364a0.tar.xz slixmpp-ad978700fc891602c826dea03615c396f39364a0.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions