]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into directory
authorZach Copley <zach@status.net>
Fri, 4 Mar 2011 05:13:21 +0000 (21:13 -0800)
committerZach Copley <zach@status.net>
Fri, 4 Mar 2011 05:13:21 +0000 (21:13 -0800)

Trivial merge