]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x
authorEvan Prodromou <evan@status.net>
Mon, 4 Jul 2011 16:26:59 +0000 (12:26 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 4 Jul 2011 16:26:59 +0000 (12:26 -0400)

Trivial merge