]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of ../trunk
authorsarven <csarven@plantard.controlezvous.ca>
Thu, 22 Jan 2009 20:39:42 +0000 (20:39 +0000)
committersarven <csarven@plantard.controlezvous.ca>
Thu, 22 Jan 2009 20:39:42 +0000 (20:39 +0000)

Trivial merge