summaryrefslogtreecommitdiff
path: root/lib/jabber.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-03-31 11:00:22 +0200
committerSarven Capadisli <csarven@status.net>2010-03-31 11:00:22 +0200
commit89bb05311685d1bab404300e600f61deb954e18c (patch)
treeeb3ad499fac437d2eb0cdf7afa7090a817047a77 /lib/jabber.php
parent534c12e540f57846af82758678a0e8064ac49f5b (diff)
parentcfeb1bfa419e886a1b60dfcbd4260d2f5de0515b (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