]> 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: 7afad46 7214db1)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorZach Copley <zach@status.net>
Tue, 9 Mar 2010 11:07:42 +0000 (11:07 +0000)
committerZach Copley <zach@status.net>
Tue, 9 Mar 2010 11:07:42 +0000 (11:07 +0000)

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