diff options
| author | Nathan Fritz <nathan@andyet.net> | 2011-02-05 04:54:52 -0800 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2011-02-05 04:54:52 -0800 |
| commit | 683f717cf756b6487c9dcdfcc0aee4923da7f7c9 (patch) | |
| tree | 0a23b3fae5171f0b7bf62cea9d6c6ad3a66e5ea8 /todo1.0 | |
| parent | 8dbe6f65462ec9b1a0506a00316415996f4d53d8 (diff) | |
| parent | b68e7bed403924dc4ebf7294854d4892c48ce0ab (diff) | |
| download | slixmpp-683f717cf756b6487c9dcdfcc0aee4923da7f7c9.tar.gz slixmpp-683f717cf756b6487c9dcdfcc0aee4923da7f7c9.tar.bz2 slixmpp-683f717cf756b6487c9dcdfcc0aee4923da7f7c9.tar.xz slixmpp-683f717cf756b6487c9dcdfcc0aee4923da7f7c9.zip | |
fixed merge
Diffstat (limited to 'todo1.0')
0 files changed, 0 insertions, 0 deletions