]> 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: 884c3d0 985ff92)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Mon, 7 Mar 2011 20:12:51 +0000 (15:12 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 7 Mar 2011 20:12:51 +0000 (15:12 -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. :-)