]> 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: fba840e da5e6a6)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Thu, 14 Jan 2010 01:40:39 +0000 (17:40 -0800)
committerEvan Prodromou <evan@status.net>
Thu, 14 Jan 2010 01:40:39 +0000 (17:40 -0800)

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