projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f071b2 08fc605)
Merge branch '0.9.x' into tinymce
authorBrion Vibber <brion@status.net>
Tue, 10 Aug 2010 22:01:29 +0000 (15:01 -0700)
committerBrion Vibber <brion@status.net>
Tue, 10 Aug 2010 22:01:29 +0000 (15:01 -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. :-)