]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 5 Feb 2009 16:47:47 +0000 (11:47 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 5 Feb 2009 16:47:47 +0000 (11:47 -0500)

Trivial merge