projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ea0b06 aceaeb9)
Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Thu, 8 Apr 2010 16:16:31 +0000 (12:16 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 8 Apr 2010 16:16:31 +0000 (12:16 -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. :-)