diff options
| author | Brion Vibber <brion@pobox.com> | 2010-01-28 22:29:26 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-01-28 22:29:26 -0800 |
| commit | 990b0f7995962cc99c573a3d33109c337b36ec10 (patch) | |
| tree | 2bcb1a1361d8b7cba78215c3c5fa03e6c6c82ac8 /lib/jabber.php | |
| parent | ccb678ad15ee57302c751ea995264415c64ad298 (diff) | |
| parent | fa9ae594454793b20c22959750043d19224c9ff4 (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions