projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d12ec0 6291e82)
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@status.net>
Fri, 12 Nov 2010 21:32:48 +0000 (13:32 -0800)
committerBrion Vibber <brion@status.net>
Fri, 12 Nov 2010 21:32:48 +0000 (13:32 -0800)
Conflicts:
actions/newgroup.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. :-)