]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Sun, 17 May 2009 16:16:02 +0000 (12:16 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Sun, 17 May 2009 16:16:02 +0000 (12:16 -0400)

Trivial merge