diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-29 15:14:25 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-29 15:14:25 -0700 |
| commit | 873b8328272ae9cb189477fd10e75b16d5ce050e (patch) | |
| tree | 89979da777a4d2158321f56a69409882d6e96321 /plugins/Xmpp/xmppmanager.php | |
| parent | a8d92dad5e4b82dd5a4f0ca7ed52f37256b60cd2 (diff) | |
| parent | bf468e2a8db4d67a0f1a2c7fdfd0aa9306e006fc (diff) | |
Merge branch 'master' into testing
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
Diffstat (limited to 'plugins/Xmpp/xmppmanager.php')
0 files changed, 0 insertions, 0 deletions