projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5414396 f514f7b)
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Mon, 3 May 2010 23:27:35 +0000 (16:27 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 3 May 2010 23:27:35 +0000 (16:27 -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. :-)