]> 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>
Sat, 7 Mar 2009 17:46:35 +0000 (09:46 -0800)
committerEvan Prodromou <evan@controlyourself.ca>
Sat, 7 Mar 2009 17:46:35 +0000 (09:46 -0800)

Trivial merge