summaryrefslogtreecommitdiff
path: root/lib/xmppmanager.php
diff options
context:
space:
mode:
authorEric Helgeson <erichelgeson@gmail.com>2010-01-16 17:42:53 -0500
committerEric Helgeson <erichelgeson@gmail.com>2010-01-16 17:42:53 -0500
commite3dc45d103666b090777a1304ca093ab8f45c803 (patch)
treedee4bf5e55894f3758c2706f826e9d2357676207 /lib/xmppmanager.php
parent9dc9c404cf5082ea769fb0c1d13c55742e046849 (diff)
parent1e8707d29a6cf58d8e706b1f47cf1b90b337f35e (diff)
Merge commit 'refs/merge-requests/117' of git://gitorious.org/statusnet/mainline into integration
Diffstat (limited to 'lib/xmppmanager.php')
0 files changed, 0 insertions, 0 deletions