diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-13 22:57:25 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-13 22:57:25 -0800 |
| commit | b59188dc77710a7d3863c640b6689f0d4008269d (patch) | |
| tree | eada7a447d4502dcf3575453bc10c785091808f1 /lib/jabber.php | |
| parent | 33df3922895e61e4e347a19acba67983ed1c4c23 (diff) | |
| parent | 16742d0fde811256c386d1bae9768fcd939b9af8 (diff) | |
Merge branch 'master' into 0.9.x
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions