summaryrefslogtreecommitdiff
path: root/lib/jabber.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-26 10:28:10 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-26 10:28:10 -0400
commitbe5d113fc684fcbe41b8374c62bfeb0f267216b7 (patch)
tree1c6b9a808c8cf2242ce6372244b47f92c6d43a51 /lib/jabber.php
parentc5cf2c4c94794a1aeea32a427ddd50e157fa893d (diff)
parent6dc89e766fd2f48d4cec61a2ae8540397c2ac76e (diff)
Merge branch 'master' into testing
Diffstat (limited to 'lib/jabber.php')
0 files changed, 0 insertions, 0 deletions