]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Fri, 13 Aug 2010 21:51:51 +0000 (14:51 -0700)
committerEvan Prodromou <evan@status.net>
Fri, 13 Aug 2010 21:51:51 +0000 (14:51 -0700)

Trivial merge