diff options
author | Lance Stout <lancestout@gmail.com> | 2011-01-13 22:16:46 -0500 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-01-13 22:16:46 -0500 |
commit | 65931bb384aada922c5287a3ad3cc62d04d6e676 (patch) | |
tree | 27297893f7cfa3be0dff1c4be5c81dbbfab6fcb0 /todo1.0 | |
parent | a5d53b3349dc1488da57a7b02758ab1063b4560c (diff) | |
parent | 632827f213235ab33f08dc133cf50b2c9287cfd0 (diff) | |
download | slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.tar.gz slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.tar.bz2 slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.tar.xz slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'todo1.0')
0 files changed, 0 insertions, 0 deletions