projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44af31d e530a08)
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Sat, 30 Jul 2011 12:18:22 +0000 (08:18 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 30 Jul 2011 12:18:22 +0000 (08:18 -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. :-)