]> 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>
Thu, 30 Jun 2011 19:44:11 +0000 (15:44 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 30 Jun 2011 19:44:11 +0000 (15:44 -0400)

Trivial merge