summaryrefslogtreecommitdiff
path: root/todo1.0
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-08-03 17:37:15 -0700
committerLance Stout <lancestout@gmail.com>2011-08-03 17:37:15 -0700
commitd94517d9ca435dbe4d45a35833eaebbdce45b21b (patch)
tree3a8a48b6a9aa17523531b75852ecf1a39825f9af /todo1.0
parent0bec040cfed632c40b820eec326f6af262ccde4a (diff)
parente022b2a36c342b6a83d7c7f0a39dfb851cdfd2de (diff)
downloadslixmpp-d94517d9ca435dbe4d45a35833eaebbdce45b21b.tar.gz
slixmpp-d94517d9ca435dbe4d45a35833eaebbdce45b21b.tar.bz2
slixmpp-d94517d9ca435dbe4d45a35833eaebbdce45b21b.tar.xz
slixmpp-d94517d9ca435dbe4d45a35833eaebbdce45b21b.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'todo1.0')
0 files changed, 0 insertions, 0 deletions