]> 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: 6b4c3e5 a6a0560)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorSarven Capadisli <csarven@status.net>
Thu, 4 Mar 2010 17:51:18 +0000 (12:51 -0500)
committerSarven Capadisli <csarven@status.net>
Thu, 4 Mar 2010 17:51:18 +0000 (12: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. :-)