]> 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: 78eb9c7 b157fcb)
Merge branch '0.9.x' into 1.0.x
authorCraig Andrews <candrews@integralblue.com>
Fri, 22 Jan 2010 22:20:10 +0000 (17:20 -0500)
committerCraig Andrews <candrews@integralblue.com>
Fri, 22 Jan 2010 22:20:10 +0000 (17:20 -0500)

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