]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Wed, 20 Jan 2010 22:55:12 +0000 (17:55 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 20 Jan 2010 22:55:12 +0000 (17:55 -0500)

Trivial merge