]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
authorSarven Capadisli <csarven@controlyourself.ca>
Sun, 12 Apr 2009 21:41:20 +0000 (21:41 +0000)
committerSarven Capadisli <csarven@controlyourself.ca>
Sun, 12 Apr 2009 21:41:20 +0000 (21:41 +0000)

Trivial merge