diff options
author | Brian Beggs <macdiesel@macdiesel.(none)> | 2010-05-13 10:01:46 -0400 |
---|---|---|
committer | Brian Beggs <macdiesel@macdiesel.(none)> | 2010-05-13 10:01:46 -0400 |
commit | 2d89954412a66a4433a7a8bc7a884964c4b911f1 (patch) | |
tree | 330e3a05f35675b0779060656156cefe320e27f2 /tests/test_disco.py | |
parent | 1521a8b5c9d656ef80a4caf3d7daa86f8f504423 (diff) | |
parent | ae41c08fecfe627627f2a4d9b3861d4ae24d673e (diff) | |
download | slixmpp-2d89954412a66a4433a7a8bc7a884964c4b911f1.tar.gz slixmpp-2d89954412a66a4433a7a8bc7a884964c4b911f1.tar.bz2 slixmpp-2d89954412a66a4433a7a8bc7a884964c4b911f1.tar.xz slixmpp-2d89954412a66a4433a7a8bc7a884964c4b911f1.zip |
Merge commit 'fritzy/master'
Diffstat (limited to 'tests/test_disco.py')
0 files changed, 0 insertions, 0 deletions