projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c78421 047c87d)
Merge branch 'master' of ../trunk
authorsarven <csarven@plantard.controlezvous.ca>
Wed, 21 Jan 2009 06:32:49 +0000 (06:32 +0000)
committersarven <csarven@plantard.controlezvous.ca>
Wed, 21 Jan 2009 06:32:49 +0000 (06:32 +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. :-)