]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Wed, 4 May 2011 20:05:06 +0000 (13:05 -0700)
committerEvan Prodromou <evan@status.net>
Wed, 4 May 2011 20:05:06 +0000 (13:05 -0700)

Trivial merge