]> 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>
Tue, 21 Jul 2009 19:50:45 +0000 (12:50 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Tue, 21 Jul 2009 19:50:45 +0000 (12:50 -0700)

Trivial merge