]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into limitdist2
authorEvan Prodromou <evan@status.net>
Mon, 28 Mar 2011 14:04:45 +0000 (10:04 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 28 Mar 2011 14:04:45 +0000 (10:04 -0400)

Trivial merge