diff options
| author | Brion Vibber <brion@pobox.com> | 2010-04-08 10:16:55 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-04-08 10:16:55 -0700 |
| commit | ee438cf1980c859ea0ff15ea455434ac26f7c90e (patch) | |
| tree | 40a7fbc334291b27231f7f43a05f2306ad0280d2 /lib/xmppmanager.php | |
| parent | f255b368edc06db8af57f7ad4d13542a126c42bc (diff) | |
| parent | ecd31384ed9560aac350085733af4039cf344c8a (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/xmppmanager.php')
0 files changed, 0 insertions, 0 deletions