]> 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: 135c0c8 a9dabbe)
Merge remote branch 'statusnet/testing' into crypt-rsa-switch
authorJames Walker <walkah@walkah.net>
Sat, 13 Mar 2010 15:51:32 +0000 (10:51 -0500)
committerJames Walker <walkah@walkah.net>
Sat, 13 Mar 2010 15:51:32 +0000 (10:51 -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. :-)