]> 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: ad2fd9a 600a718)
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Fri, 2 Dec 2011 20:48:43 +0000 (15:48 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 2 Dec 2011 20:48:43 +0000 (15:48 -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. :-)