]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into limitdist2
authorEvan Prodromou <evan@status.net>
Sat, 26 Mar 2011 19:37:05 +0000 (15:37 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 26 Mar 2011 19:37:05 +0000 (15:37 -0400)

Trivial merge