]> 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: 9c63ae6 c066e52)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Thu, 25 Mar 2010 21:24:10 +0000 (17:24 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 25 Mar 2010 21:24:10 +0000 (17:24 -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. :-)