]> 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: 11d9c19 234e6a1)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Tue, 1 Dec 2009 17:11:05 +0000 (12:11 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 1 Dec 2009 17:11:05 +0000 (12:11 -0500)

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