diff options
author | Lance Stout <lancestout@gmail.com> | 2011-06-20 16:27:39 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-06-20 16:27:39 -0700 |
commit | 847510c6b577f889cdba5deaa0bb271475cc7c7f (patch) | |
tree | 100daed3b22acf6c7c6d338bc9c4f73fdb175467 /todo1.0 | |
parent | 393d702e77a82231a20b42a75e191b7e00b3f5c3 (diff) | |
parent | d8d9e8df16c07bd13bbac72e4445a2930407b244 (diff) | |
download | slixmpp-847510c6b577f889cdba5deaa0bb271475cc7c7f.tar.gz slixmpp-847510c6b577f889cdba5deaa0bb271475cc7c7f.tar.bz2 slixmpp-847510c6b577f889cdba5deaa0bb271475cc7c7f.tar.xz slixmpp-847510c6b577f889cdba5deaa0bb271475cc7c7f.zip |
Merge branch 'develop' into exceptions
Diffstat (limited to 'todo1.0')
0 files changed, 0 insertions, 0 deletions