]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.7.x' of evan@dev.controlyourself.ca:/var/www/evan into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 20 Feb 2009 14:54:17 +0000 (09:54 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 20 Feb 2009 14:54:17 +0000 (09:54 -0500)

Trivial merge