summaryrefslogtreecommitdiff
path: root/plugins/Xmpp/xmppmanager.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-29 15:15:51 -0700
committerBrion Vibber <brion@pobox.com>2010-03-29 15:15:51 -0700
commit01a03e34c8d286011c0f4301e60c103d992a449a (patch)
treed9c5a44704b83d3ca05ed1f136a3748fb8210f12 /plugins/Xmpp/xmppmanager.php
parente2d3ebb9f4a3b516067745d250b4723367b928c2 (diff)
parentcfeb1bfa419e886a1b60dfcbd4260d2f5de0515b (diff)
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'plugins/Xmpp/xmppmanager.php')
0 files changed, 0 insertions, 0 deletions