]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 21 Aug 2009 20:17:45 +0000 (16:17 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 21 Aug 2009 20:17:45 +0000 (16:17 -0400)

Trivial merge