]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Sat, 3 Apr 2010 17:15:03 +0000 (10:15 -0700)
committerBrion Vibber <brion@pobox.com>
Sat, 3 Apr 2010 17:15:03 +0000 (10:15 -0700)

Trivial merge