]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 826a695 4193a82)
Merge branch 'master' into 0.9.x
authorBrion Vibber <brion@status.net>
Fri, 19 Nov 2010 23:38:20 +0000 (15:38 -0800)
committerBrion Vibber <brion@status.net>
Fri, 19 Nov 2010 23:38:20 +0000 (15:38 -0800)

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. :-)