]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'userdesign' of evan@dev.controlyourself.ca:/var/www/evan into userdesign
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 10 Jun 2009 04:52:02 +0000 (21:52 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 10 Jun 2009 04:52:02 +0000 (21:52 -0700)

Trivial merge