diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-08-01 23:03:56 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-08-01 23:03:56 -0700 |
| commit | 2f65fdbc76e46a3468d46bec7f2655a053cb5039 (patch) | |
| tree | a52261be01ccdae03ee4828aac9828c09b8c29b5 /docs | |
| parent | 2f4149c7d05f05c041ce5d393f5a13e1075c3d14 (diff) | |
| parent | 59ff08174fd83d4c1c2759be7d24011ccd7419d4 (diff) | |
| download | slixmpp-2f65fdbc76e46a3468d46bec7f2655a053cb5039.tar.gz slixmpp-2f65fdbc76e46a3468d46bec7f2655a053cb5039.tar.bz2 slixmpp-2f65fdbc76e46a3468d46bec7f2655a053cb5039.tar.xz slixmpp-2f65fdbc76e46a3468d46bec7f2655a053cb5039.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions