]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of root@laconi.ca:/var/www/laconi.ca/software/laconica
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 8 Apr 2009 02:23:30 +0000 (22:23 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 8 Apr 2009 02:23:30 +0000 (22:23 -0400)

Trivial merge