]> 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: 82326a3 d352e5f)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Wed, 7 Apr 2010 14:44:00 +0000 (10:44 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 7 Apr 2010 14:44:00 +0000 (10:44 -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. :-)