]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into directory
authorZach Copley <zach@status.net>
Wed, 2 Mar 2011 03:36:11 +0000 (19:36 -0800)
committerZach Copley <zach@status.net>
Wed, 2 Mar 2011 03:36:11 +0000 (19:36 -0800)

Trivial merge