]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
authorSarven Capadisli <csarven@controlyourself.ca>
Fri, 26 Jun 2009 00:48:13 +0000 (00:48 +0000)
committerSarven Capadisli <csarven@controlyourself.ca>
Fri, 26 Jun 2009 00:48:13 +0000 (00:48 +0000)

Trivial merge