]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.8.x
authorEvan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:15:36 +0000 (17:15 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:15:36 +0000 (17:15 -0400)

Trivial merge