]> 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: d9e56e1 f0c5e7e)
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Sat, 26 Jun 2010 19:09:08 +0000 (15:09 -0400)
committerBrion Vibber <brion@pobox.com>
Sat, 26 Jun 2010 19:09:08 +0000 (15:09 -0400)

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