projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d107164 a984aae)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Fri, 11 Mar 2011 00:16:06 +0000 (16:16 -0800)
committerBrion Vibber <brion@pobox.com>
Fri, 11 Mar 2011 00:16:06 +0000 (16:16 -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. :-)