diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-02-24 16:19:35 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-02-24 16:19:35 -0500 |
| commit | c2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc (patch) | |
| tree | 500caa5f1ebaaf24044b4c81ed03d63ee464572c /todo1.0 | |
| parent | d5b3a5282763e4f74816ff392bd8cd47dd9f7a95 (diff) | |
| parent | 45ccb313560fbfbc0354ebac9116ecb9ff963a47 (diff) | |
| download | slixmpp-c2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc.tar.gz slixmpp-c2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc.tar.bz2 slixmpp-c2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc.tar.xz slixmpp-c2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'todo1.0')
0 files changed, 0 insertions, 0 deletions