projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c2d4de acaf86c)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Fri, 15 Apr 2011 03:58:02 +0000 (23:58 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 15 Apr 2011 03:58:02 +0000 (23:58 -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. :-)