]> 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: 0de0ae2 90a7631)
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x
authorSiebrand Mazeland <s.mazeland@xs4all.nl>
Fri, 18 Mar 2011 15:09:27 +0000 (16:09 +0100)
committerSiebrand Mazeland <s.mazeland@xs4all.nl>
Fri, 18 Mar 2011 15:09:27 +0000 (16:09 +0100)

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. :-)