diff options
author | Lance Stout <lancestout@gmail.com> | 2011-06-10 15:15:01 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-06-10 15:15:01 -0700 |
commit | 6d59f55fd45a3fa4ec27b45197a95a5aa308f3d2 (patch) | |
tree | ba8bb27f08f499dc56c290e4313ef2a722cefa58 /todo1.0 | |
parent | 5c1562f36b833866e67d8ea8fb61862afbc5a0e4 (diff) | |
parent | e2d18170b00349e07b4e74fa16c73368c19863d4 (diff) | |
download | slixmpp-6d59f55fd45a3fa4ec27b45197a95a5aa308f3d2.tar.gz slixmpp-6d59f55fd45a3fa4ec27b45197a95a5aa308f3d2.tar.bz2 slixmpp-6d59f55fd45a3fa4ec27b45197a95a5aa308f3d2.tar.xz slixmpp-6d59f55fd45a3fa4ec27b45197a95a5aa308f3d2.zip |
Merge branch 'develop' into exceptions
Diffstat (limited to 'todo1.0')
0 files changed, 0 insertions, 0 deletions