diff options
| author | Brion Vibber <brion@pobox.com> | 2010-04-14 11:15:21 +0200 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-04-14 11:15:21 +0200 |
| commit | 3da50c19dfff7645dc46f1b836ebf4ecda726129 (patch) | |
| tree | da9ca58a8ed97fafc209891a8eb1d1fbeb14822e /lib/jabber.php | |
| parent | a05e674843afdbae3f138f541624708a664f1f2a (diff) | |
| parent | a21a17263956808e074fb62551300c5d6297387b (diff) | |
Merge branch 'master' into testing
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions