]> 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: da4463c 1bc45e1)
Merge branch 'master' of gitorious.org:statusnet/mainline
authorZach Copley <zach@status.net>
Tue, 21 Sep 2010 20:08:01 +0000 (13:08 -0700)
committerZach Copley <zach@status.net>
Tue, 21 Sep 2010 20:08:01 +0000 (13:08 -0700)

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