diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-02-01 20:32:48 +0100 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-02-01 20:32:48 +0100 |
| commit | 95e70f5e533fa267a5137b76dda828e3a46e634e (patch) | |
| tree | 91327ff232e2faf82f76c138850b7ea538319c7c /lib/jabber.php | |
| parent | d40e72becaa7b0b1a51de8edb634d2ed5a953875 (diff) | |
| parent | f964357de944e79ffbca062c60240f7784d98f08 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions