]> 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: 040b4b7 e3a46d2)
Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Mon, 29 Mar 2010 22:15:41 +0000 (15:15 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 29 Mar 2010 22:15:41 +0000 (15:15 -0700)

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