]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95942f0 f5bde9b)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorBrion Vibber <brion@pobox.com>
Wed, 16 Mar 2011 22:56:32 +0000 (15:56 -0700)
committerBrion Vibber <brion@pobox.com>
Wed, 16 Mar 2011 22:56:32 +0000 (15:56 -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. :-)