diff options
| author | Evan Prodromou <evan@status.net> | 2009-12-22 08:53:50 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-12-22 08:53:50 -0800 |
| commit | a2cb0a033fa6777d824dc40e759294287bd83939 (patch) | |
| tree | 96b6947fd9aa7a76c1888a127e21e34319334f9b /lib/jabber.php | |
| parent | f17016470170401e1ad1b869c740063a578cb4cd (diff) | |
| parent | c9c316db7f003e018202e6c9f39770c208aecc05 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions