]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 23 Jul 2009 21:48:58 +0000 (14:48 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 23 Jul 2009 21:48:58 +0000 (14:48 -0700)

Trivial merge