]> 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: 42f3fed 6943f00)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Mon, 20 Jun 2011 21:28:02 +0000 (17:28 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 20 Jun 2011 21:28:02 +0000 (17:28 -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. :-)