diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-10 11:12:11 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-10 11:12:11 -0800 |
| commit | c4557d4d0700c09742b9d2e002c2d2b0161558f3 (patch) | |
| tree | 9d170ecf9dec60c289b7a1e8d1fc51dce9c0076b /lib/xmppmanager.php | |
| parent | f37063cd63a30fdcc0948d4710c088ba5e5d0990 (diff) | |
| parent | d9c9b2a12fe6cbb800440eeb0174d375760e0103 (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