diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-03 17:02:33 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-03 17:02:33 -0700 |
| commit | 3918ddb07517f944c6a5c10ee84efc47a6290b0e (patch) | |
| tree | 267458135b7d619999af5fc456d970dc82e88f06 /docs | |
| parent | d4091dbde641dc9796b51e032ea23a0ba5c1fcbb (diff) | |
| parent | ccc6ab128128990babbf63d4586cdd43384ae320 (diff) | |
| download | slixmpp-3918ddb07517f944c6a5c10ee84efc47a6290b0e.tar.gz slixmpp-3918ddb07517f944c6a5c10ee84efc47a6290b0e.tar.bz2 slixmpp-3918ddb07517f944c6a5c10ee84efc47a6290b0e.tar.xz slixmpp-3918ddb07517f944c6a5c10ee84efc47a6290b0e.zip | |
Merge branch 'develop' into stream_features
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions