]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into 1.0.x
authorZach Copley <zach@status.net>
Tue, 1 Mar 2011 00:41:24 +0000 (16:41 -0800)
committerZach Copley <zach@status.net>
Tue, 1 Mar 2011 00:41:24 +0000 (16:41 -0800)

Trivial merge