]> 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: 2085b50 027c7e6)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Tue, 2 Feb 2010 23:17:58 +0000 (23:17 +0000)
committerZach Copley <zach@status.net>
Tue, 2 Feb 2010 23:17:58 +0000 (23:17 +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. :-)