]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:laconica/mainline
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 10 Aug 2009 20:33:36 +0000 (16:33 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 10 Aug 2009 20:33:36 +0000 (16:33 -0400)

Trivial merge