summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-22 20:10:07 -0700
committerLance Stout <lancestout@gmail.com>2012-10-22 20:10:07 -0700
commit3655827ef2e268e9ab327e4a6c788c3e336146e0 (patch)
tree06a916dbfb9ce40897fd56a2051bbeeea64d6e17 /README.rst
parent12e0e1a16b56f8a4797912ae0ab4c057c07b0b9f (diff)
parentc5046b9c91a77488424c1f77407a2875a9fea45a (diff)
downloadslixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.tar.gz
slixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.tar.bz2
slixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.tar.xz
slixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.zip
Merge branch 'master' into develop
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions