diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-24 13:57:20 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-24 13:57:20 -0700 |
| commit | ecb009bcf5a6893b90d153be18c423dd7377796d (patch) | |
| tree | a49b25af801b21aac04b62779d627221514dbb43 /lib/xmppmanager.php | |
| parent | 9fe12be41eec8132fcfa6da2dc5fad926a932286 (diff) | |
| parent | a954fd65ba00328cd1a76e620113d2f639340aaf (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/xmppmanager.php')
0 files changed, 0 insertions, 0 deletions