projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22255da 84fa377)
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Thu, 25 Feb 2010 17:28:19 +0000 (09:28 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 25 Feb 2010 17:28:19 +0000 (09:28 -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. :-)