projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d878b7 cc6e4c9)
Merge branch 'testing' into 0.9.x
authorEvan Prodromou <evan@status.net>
Fri, 3 Sep 2010 03:41:56 +0000 (23:41 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 3 Sep 2010 03:41:56 +0000 (23:41 -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. :-)