]> 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>
Wed, 15 Jul 2009 20:03:38 +0000 (16:03 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 15 Jul 2009 20:03:38 +0000 (16:03 -0400)

Trivial merge