]> 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: 7390b1d d737466)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Mon, 1 Feb 2010 16:49:50 +0000 (11:49 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 1 Feb 2010 16:49:50 +0000 (11:49 -0500)

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