diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-05 17:11:23 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-05 17:11:23 -0700 |
| commit | 173778eab145cfd73f597cd75db195e4d47fe323 (patch) | |
| tree | 78034559817d04f7fd6531f270e857b3bd55bf72 /lib/stompqueuemanager.php | |
| parent | ddc7811a7b412c9c3c4b6bfb9350dd18a62fdf51 (diff) | |
| parent | e05415f621890bbaf42752577249ecdc22c161fc (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
Diffstat (limited to 'lib/stompqueuemanager.php')
0 files changed, 0 insertions, 0 deletions