diff options
author | Zach Copley <zach@status.net> | 2010-01-29 06:08:55 +0000 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-01-29 06:08:55 +0000 |
commit | fa9ae594454793b20c22959750043d19224c9ff4 (patch) | |
tree | 66b758c5be754c0e66fb5de689572aab1543ff7a /lib/jabber.php | |
parent | 288dc3452f3c274d2165d8e7d502631a6eacc97c (diff) | |
parent | 440ee00b1ed9c1b0b552c14b72c962a79e1a402e (diff) |
Merge branch 'testing'
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions