projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cd6057 9d9e80e)
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Tue, 12 Oct 2010 21:54:04 +0000 (14:54 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 12 Oct 2010 21:54:04 +0000 (14:54 -0700)

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