summaryrefslogtreecommitdiff
path: root/lib/jabber.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-08 15:47:55 -0800
committerBrion Vibber <brion@pobox.com>2010-02-08 15:47:55 -0800
commit4e6f587f868d71f08c618d0dedf6ddf0331619c2 (patch)
treec94a60cc0d6a37b2a97e8aa6bd646f13f6fc4b1e /lib/jabber.php
parentb9b0f0410aa688cc3ee77df1563773527a8d59a9 (diff)
parent96ef4435b61570dbbf15d921a42543bfb13786c0 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions