]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '2141' into 0.9.x
authorBrion Vibber <brion@status.net>
Mon, 4 Jan 2010 20:02:45 +0000 (12:02 -0800)
committerBrion Vibber <brion@status.net>
Mon, 4 Jan 2010 20:02:45 +0000 (12:02 -0800)

Trivial merge