]> 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, 19 Apr 2009 02:36:41 +0000 (19:36 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Sun, 19 Apr 2009 02:36:41 +0000 (19:36 -0700)

Trivial merge