projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 546ab05 af89dca)
Merge branch 'dev/0.8.x' into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 23 Apr 2009 07:22:37 +0000 (03:22 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 23 Apr 2009 07:22:37 +0000 (03:22 -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. :-)