]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 9 Feb 2009 17:03:45 +0000 (12:03 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 9 Feb 2009 17:03:45 +0000 (12:03 -0500)

Trivial merge