]> 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: 31b62bf 78214c4)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Tue, 5 Jan 2010 01:11:04 +0000 (15:11 -1000)
committerEvan Prodromou <evan@status.net>
Tue, 5 Jan 2010 01:11:04 +0000 (15:11 -1000)

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