projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78a9d49 d4aef7a)
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 5 May 2011 21:45:50 +0000 (14:45 -0700)
committerEvan Prodromou <evan@status.net>
Thu, 5 May 2011 21:45:50 +0000 (14:45 -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. :-)