projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5b4df4 7c828ae)
Merge branch 'openid-teams' into testing
authorBrion Vibber <brion@pobox.com>
Tue, 18 May 2010 20:37:46 +0000 (13:37 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 18 May 2010 20:37:46 +0000 (13:37 -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. :-)