]> 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: 32845a1 2cbfc8c)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Thu, 29 Sep 2011 16:32:09 +0000 (12:32 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 29 Sep 2011 16:32:09 +0000 (12:32 -0400)

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