summaryrefslogtreecommitdiff
path: root/sleekxmpp/stanza/atom.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-09-28 11:02:57 -0700
committerLance Stout <lancestout@gmail.com>2012-09-28 11:02:57 -0700
commita2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3 (patch)
tree40d99fd4b547e4f81e2c9c2b29682c6bb7ac7a06 /sleekxmpp/stanza/atom.py
parent73ce9a5eccb5fea6f9a6dd72410cdada2a43347f (diff)
parentee9c4abd08db06fd6dc808d48c43cd6d57bd1aa1 (diff)
downloadslixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.tar.gz
slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.tar.bz2
slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.tar.xz
slixmpp-a2c60a4911c64a8b40c39dfb9d74ed0eaed0e9b3.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/stanza/atom.py')
0 files changed, 0 insertions, 0 deletions