]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Tue, 17 Feb 2009 15:22:42 +0000 (10:22 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Tue, 17 Feb 2009 15:22:42 +0000 (10:22 -0500)

Trivial merge