]> 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: 3a9e24e f397d35)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorZach Copley <zach@status.net>
Mon, 11 Jan 2010 23:22:24 +0000 (23:22 +0000)
committerZach Copley <zach@status.net>
Mon, 11 Jan 2010 23:22:24 +0000 (23:22 +0000)

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