]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'uiredesign' of evan@dev.controlyourself.ca:/var/www/evan into uiredesign
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 15 Jan 2009 19:31:49 +0000 (14:31 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 15 Jan 2009 19:31:49 +0000 (14:31 -0500)

Trivial merge