]> 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: 10281d5 aa0b2ce)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Sun, 21 Feb 2010 22:44:28 +0000 (14:44 -0800)
committerZach Copley <zach@status.net>
Sun, 21 Feb 2010 22:44:28 +0000 (14:44 -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. :-)