]> 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: 2c03dd5 babdc43)
Merge branch '1.0.x' into inline-comments
authorBrion Vibber <brion@pobox.com>
Mon, 28 Feb 2011 20:25:42 +0000 (12:25 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 28 Feb 2011 20:25:42 +0000 (12:25 -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. :-)