projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07bc802 39c6e34)
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Wed, 16 Feb 2011 18:56:55 +0000 (13:56 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 16 Feb 2011 18:56:55 +0000 (13:56 -0500)

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