summaryrefslogtreecommitdiff
path: root/todo1.0
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-07-03 00:39:02 -0700
committerLance Stout <lancestout@gmail.com>2011-07-03 00:39:02 -0700
commit48fb7006f75dd03caa23f61cb512f9002fe91b90 (patch)
treebbaea934492ba83c0a7e40b9c7d798f3743e37e5 /todo1.0
parent7057984831b2a96980871476686273f8591f8101 (diff)
parent086bf89d699c88ab89ad1e1975d6022335ca5c04 (diff)
downloadslixmpp-48fb7006f75dd03caa23f61cb512f9002fe91b90.tar.gz
slixmpp-48fb7006f75dd03caa23f61cb512f9002fe91b90.tar.bz2
slixmpp-48fb7006f75dd03caa23f61cb512f9002fe91b90.tar.xz
slixmpp-48fb7006f75dd03caa23f61cb512f9002fe91b90.zip
Merge branch 'develop' into roster
Diffstat (limited to 'todo1.0')
0 files changed, 0 insertions, 0 deletions