]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50b9f5f 85321ce)
Merge branch 'master' of ../trunk
authorsarven <csarven@plantard.controlezvous.ca>
Fri, 23 Jan 2009 08:19:16 +0000 (08:19 +0000)
committersarven <csarven@plantard.controlezvous.ca>
Fri, 23 Jan 2009 08:19:16 +0000 (08:19 +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. :-)