]> 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>
Mon, 27 Jul 2009 17:12:18 +0000 (13:12 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 27 Jul 2009 17:12:18 +0000 (13:12 -0400)

Trivial merge