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

Trivial merge