]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into profile-fixups
authorZach Copley <zach@status.net>
Thu, 10 Mar 2011 22:22:41 +0000 (14:22 -0800)
committerZach Copley <zach@status.net>
Thu, 10 Mar 2011 22:22:41 +0000 (14:22 -0800)

Trivial merge