projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9b0f04 96ef443)
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Mon, 8 Feb 2010 23:47:55 +0000 (15:47 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 8 Feb 2010 23:47:55 +0000 (15:47 -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. :-)