diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-10 10:07:52 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-10 10:07:52 -0800 |
| commit | 9b75e162c7002c1f29fa4ba6c1bfab7fb6b163f8 (patch) | |
| tree | 048a7386747a577cc7c5106ddee080f79f80546e /scripts/xmppdaemon.php | |
| parent | ddb656fcd2a3233b26e28987d2f3425944908d30 (diff) | |
| parent | 69b2f19b6fef793aa607c6d8f4590b93e2565626 (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