diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-25 13:08:57 -0700 |
| commit | ca489631db840e33757a71a7e4cb56b187c182d3 (patch) | |
| tree | 92c71b81b6870a8fd2d9c94bed8571b653d95413 /plugins/Aim/README | |
| parent | 90c87553ee7566593529199374215ae80bb3e209 (diff) | |
| parent | 01637bcd32921d6857fb7f5c0bbd40fba6bdb830 (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
Diffstat (limited to 'plugins/Aim/README')
0 files changed, 0 insertions, 0 deletions