diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-25 18:13:09 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-25 18:13:09 -0500 |
| commit | 663e4e02a1b3b1c104c2c3db19e524a486c3d981 (patch) | |
| tree | 048e2f67c10f74e3b510646f7b955d45baa49253 /lib/xmppmanager.php | |
| parent | 1ab24832960eef698731cf0d3e72fccfa336392d (diff) | |
| parent | e26a843caf9f6bb0d11a7128884db235ededcce0 (diff) | |
Merge branch 'master' into testing
Conflicts:
lib/queuemanager.php
Diffstat (limited to 'lib/xmppmanager.php')
0 files changed, 0 insertions, 0 deletions