]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 6 Aug 2009 16:32:09 +0000 (12:32 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 6 Aug 2009 16:32:09 +0000 (12:32 -0400)

Trivial merge