]> 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: 8439774 12f68c4)
Merge branch 'master' of gitorious.org:statusnet/mainline
authorZach Copley <zach@status.net>
Fri, 1 Oct 2010 18:13:28 +0000 (11:13 -0700)
committerZach Copley <zach@status.net>
Fri, 1 Oct 2010 18:13:28 +0000 (11:13 -0700)

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