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