projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19d39b2 c14c9e1)
Merge branch '0.8.x' into twitterpriv
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 18 Jun 2009 06:56:42 +0000 (23:56 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 18 Jun 2009 06:56:42 +0000 (23:56 -0700)

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. :-)