diff options
| author | Brion Vibber <brion@pobox.com> | 2010-01-27 17:39:03 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-01-27 17:39:03 -0800 |
| commit | 0794ecf372ffff2e0cc93509ae3462ca0cbbc99c (patch) | |
| tree | 79695c758dc0e919b5cbcaaf1260125f3e97c4a2 /lib/xmppmanager.php | |
| parent | 2e0297bb6ff0fd2d3a37d811bd3305ce5d6a77ee (diff) | |
| parent | 07d50a012af70d9bd35a26f645d791ae7ba29986 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline
Diffstat (limited to 'lib/xmppmanager.php')
0 files changed, 0 insertions, 0 deletions