diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-04 14:44:38 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-04 14:44:38 -0800 |
| commit | 2f41e9333902ec3c777eab6f6264523ff85dcf7b (patch) | |
| tree | a1b05cfccb0c88e78c20575536f2eb6d760704fa /scripts/xmppdaemon.php | |
| parent | 3060bdafc57fcd32b68388d3ffc341634f0b3d55 (diff) | |
| parent | 980d1a66ec0bb5b42ddb39e253fba9bad1b41aca (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'scripts/xmppdaemon.php')
0 files changed, 0 insertions, 0 deletions