projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc67113 56403c4)
Merge branch '2828' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Thu, 14 Oct 2010 23:52:01 +0000 (16:52 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 14 Oct 2010 23:52:01 +0000 (16:52 -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. :-)