projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d55bc0 0ed572f)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Thu, 11 Nov 2010 20:32:24 +0000 (15:32 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 11 Nov 2010 20:32:24 +0000 (15:32 -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. :-)