]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git://gitorious.org/laconica/adrianlang-clone into adrianlan...
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 2 Feb 2009 21:42:27 +0000 (16:42 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 2 Feb 2009 21:42:27 +0000 (16:42 -0500)

Trivial merge