]> 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: 0841fa7 d3f9958)
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Wed, 31 Mar 2010 19:47:42 +0000 (12:47 -0700)
committerBrion Vibber <brion@pobox.com>
Wed, 31 Mar 2010 19:47:42 +0000 (12:47 -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. :-)