summaryrefslogtreecommitdiff
path: root/ez_setup.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-01-18 15:36:18 -0800
committerLance Stout <lancestout@gmail.com>2012-01-18 15:36:18 -0800
commitbb3080e829df126466c44cb2f89a0307e5c4146a (patch)
tree6cacc94dcc612d570b5010f925eb209ca9eec1e8 /ez_setup.py
parentfd515d807c9af22b2df5cbe31825bf26aad596c1 (diff)
parentbd85e9539850f691f39994ade126ccd73371f61d (diff)
downloadslixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.tar.gz
slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.tar.bz2
slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.tar.xz
slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.zip
Merge branch 'docs' into develop
Conflicts: docs/index.rst
Diffstat (limited to 'ez_setup.py')
0 files changed, 0 insertions, 0 deletions