diff options
author | Lance Stout <lancestout@gmail.com> | 2011-03-22 20:48:09 -0400 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-03-22 20:48:09 -0400 |
commit | 756c4c032f820285455c7c57e4925887f9c8e213 (patch) | |
tree | bc964a6c96cdbf9ccf1c8c82a6e9291b4d5f738a /todo1.0 | |
parent | e1360ae04946a4b6f9fe7ed19f9349ce24405dd1 (diff) | |
parent | 4b1fadde4bd87a8763131165701c08a3035005eb (diff) | |
download | slixmpp-756c4c032f820285455c7c57e4925887f9c8e213.tar.gz slixmpp-756c4c032f820285455c7c57e4925887f9c8e213.tar.bz2 slixmpp-756c4c032f820285455c7c57e4925887f9c8e213.tar.xz slixmpp-756c4c032f820285455c7c57e4925887f9c8e213.zip |
Merge branch 'develop' into roster
Diffstat (limited to 'todo1.0')
0 files changed, 0 insertions, 0 deletions