diff options
| author | Brion Vibber <brion@pobox.com> | 2010-04-10 17:54:37 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-04-10 17:54:37 -0700 |
| commit | edd883d3b009788049a9326bd6bdcc7846f87a8a (patch) | |
| tree | d8aa5c080e48da1adffc5cefdf862ebd71afe097 /lib/xmppmanager.php | |
| parent | 166c1edba97d065d0fd424621305fd016e644c43 (diff) | |
| parent | 71c828de89d4092579470c9f2ba821ae803cb557 (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/xmppmanager.php')
0 files changed, 0 insertions, 0 deletions