diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-25 09:12:45 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-25 09:12:45 -0800 |
| commit | 99c0e16844460feb42afecb43e0a5fc9e37624af (patch) | |
| tree | 052c9d3b1ff2322c247ecd7402a4910568cda1d3 /lib/xmppmanager.php | |
| parent | 66373f8e5af5b903bf32ab4a58f2f7477bd45c79 (diff) | |
| parent | e717cba19c1badb97b87e7654e7535d57fa9c9f3 (diff) | |
Merge commit 'refs/merge-requests/121' of git://gitorious.org/statusnet/mainline into integration
Diffstat (limited to 'lib/xmppmanager.php')
0 files changed, 0 insertions, 0 deletions