diff options
author | Thom Nichols <tmnichols@gmail.com> | 2010-06-02 14:18:46 -0400 |
---|---|---|
committer | Thom Nichols <tmnichols@gmail.com> | 2010-06-02 14:18:46 -0400 |
commit | 1f3cfb98f155511bc10d9630534e39adaa50feae (patch) | |
tree | 9a3ef6f75987868e0c84dc64b376025e3395b19c /setup.py | |
parent | 4295a66c70e595d02e14f384432d8eee8dfef013 (diff) | |
parent | 85a2715c7de1f436b5553a73f74c30cffa8bc04f (diff) | |
download | slixmpp-1f3cfb98f155511bc10d9630534e39adaa50feae.tar.gz slixmpp-1f3cfb98f155511bc10d9630534e39adaa50feae.tar.bz2 slixmpp-1f3cfb98f155511bc10d9630534e39adaa50feae.tar.xz slixmpp-1f3cfb98f155511bc10d9630534e39adaa50feae.zip |
Merge branch 'master' into hacks
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions