]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Sun, 24 Jan 2010 21:12:40 +0000 (16:12 -0500)
committerEvan Prodromou <evan@status.net>
Sun, 24 Jan 2010 21:12:40 +0000 (16:12 -0500)
commit4f213f985f292bab3d54671325954cae34c23fd3
tree20a9463aac7eb4843f5f2c9e74dcd8ea61d4d07c
parent54ebb0a2b99aa1a9a6a27b61e47d12692ded65b4
parent071f455b87cf7e322ba2ec300d6881e3b165f81c
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
lib/stompqueuemanager.php