]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into realprivate
authorEvan Prodromou <evan@status.net>
Mon, 11 Jul 2011 15:03:31 +0000 (11:03 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 11 Jul 2011 15:03:31 +0000 (11:03 -0400)

Trivial merge