diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-08 15:47:55 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-08 15:47:55 -0800 |
| commit | 4e6f587f868d71f08c618d0dedf6ddf0331619c2 (patch) | |
| tree | c94a60cc0d6a37b2a97e8aa6bd646f13f6fc4b1e /lib/jabber.php | |
| parent | b9b0f0410aa688cc3ee77df1563773527a8d59a9 (diff) | |
| parent | 96ef4435b61570dbbf15d921a42543bfb13786c0 (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions