]> 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: 40533ee 7de1aaf)
Merge remote branch 'origin/master'
authorEvan Prodromou <evan@status.net>
Mon, 14 Feb 2011 17:41:52 +0000 (12:41 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 14 Feb 2011 17:41:52 +0000 (12:41 -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. :-)