]> 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>
Fri, 17 Apr 2009 20:41:34 +0000 (13:41 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 17 Apr 2009 20:41:34 +0000 (13:41 -0700)

Trivial merge