]> 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, 30 Jul 2009 18:57:04 +0000 (14:57 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 30 Jul 2009 18:57:04 +0000 (14:57 -0400)

Trivial merge