]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Sun, 24 Jan 2010 20:59:57 +0000 (15:59 -0500)
committerEvan Prodromou <evan@status.net>
Sun, 24 Jan 2010 20:59:57 +0000 (15:59 -0500)
commit54ebb0a2b99aa1a9a6a27b61e47d12692ded65b4
tree3e3a4826354925e8e3a6a8a9f64146415e844858
parentd25bd9b2923606a9e4786e8cab3c1bd384235164
parent3f5ffe5c5be2290e157f6390952f75ec583b41c9
Merge branch 'master' into 0.9.x

Conflicts:
lib/stompqueuemanager.php