projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d25bd9b 3f5ffe5)
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)
Conflicts:
lib/stompqueuemanager.php


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)