diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-12 12:11:37 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-12 12:11:37 -0800 |
| commit | 392bc728c795dd50e19a56cb097ab9a64f129573 (patch) | |
| tree | b81eb9e2f45003859f554978fd1e9534d5f9c9e0 /lib/jabber.php | |
| parent | 7e5c15fa80e23d1fb22744553156bcebad716ae8 (diff) | |
| parent | cbc3c7b141b8cfd8baa35a580e9fc9ae4f50343c (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions