]> 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>
Sun, 22 Mar 2009 21:06:19 +0000 (17:06 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Sun, 22 Mar 2009 21:06:19 +0000 (17:06 -0400)

Trivial merge