summaryrefslogtreecommitdiff
path: root/lib/jabber.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-05-18 23:28:08 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-05-18 23:28:08 +0000
commit8b5bcae58fba59734a566315f04499fcc1433c75 (patch)
tree99e05cd702fa23dad02013d137bf4b624996c00a /lib/jabber.php
parent806200379d2e35a5cbf5ce4940474e1cbdd1f1a0 (diff)
parentdcd69eec9098fd6bc6340a233796d6b242953057 (diff)
Merge branch '0.7.x' into 0.8.x
Conflicts: EVENTS.txt
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions