diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-19 12:52:23 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-19 12:52:23 -0700 |
| commit | c4203be9a4e13f892fa8ea71f08477110a39dbe3 (patch) | |
| tree | 34989ca973dc56d0ba5f57583ce74fde333e4341 /plugins/Xmpp/XmppPlugin.php | |
| parent | 91367dbc2145d0ad0eebd12cd6197d54c3d3b930 (diff) | |
| parent | 7005ef66617b265ddccdd9082c2368bf014a7e83 (diff) | |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'plugins/Xmpp/XmppPlugin.php')
0 files changed, 0 insertions, 0 deletions