projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7224ca5 3d9dc11)
Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Thu, 14 Apr 2011 22:29:11 +0000 (22:29 +0000)
committerZach Copley <zach@status.net>
Thu, 14 Apr 2011 22:29:11 +0000 (22:29 +0000)

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