]> 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: 841981a 602b01a)
Merge remote branch 'statusnet/testing' into testing
authorJames Walker <walkah@walkah.net>
Tue, 9 Feb 2010 08:16:21 +0000 (03:16 -0500)
committerJames Walker <walkah@walkah.net>
Tue, 9 Feb 2010 08:16:21 +0000 (03:16 -0500)

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