projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd17e32 fd530a8)
Merge branch 'master' of git://gitorious.org/statusnet/mainline
authorIan Denhardt <ian@zenhack.net>
Mon, 9 Aug 2010 18:43:32 +0000 (14:43 -0400)
committerIan Denhardt <ian@zenhack.net>
Mon, 9 Aug 2010 18:43:32 +0000 (14:43 -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. :-)