]> 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 Mar 2009 19:04:16 +0000 (11:04 -0800)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 5 Mar 2009 19:04:16 +0000 (11:04 -0800)

Trivial merge