diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-16 09:25:09 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-16 09:25:09 -0800 |
| commit | d5cbfe8071d56438cfa168dc3db56a959317eae0 (patch) | |
| tree | c00ca6c3e0d1bd2fb9b05a515c337b6afce3a070 /plugins/Xmpp/XmppPlugin.php | |
| parent | d4f6235d7b8a40bd1b51370e7eb405cdb14e61fb (diff) | |
| parent | 81b6b58e33f55054b7e5dd546f06dbdb5696ed92 (diff) | |
Merge branch 'testing' into 0.9.x
Conflicts:
lib/iomaster.php
Diffstat (limited to 'plugins/Xmpp/XmppPlugin.php')
0 files changed, 0 insertions, 0 deletions