projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 530673b 918b662)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Thu, 17 Dec 2009 03:22:29 +0000 (22:22 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 17 Dec 2009 03:22:29 +0000 (22:22 -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. :-)