]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Sun, 15 Feb 2009 02:28:30 +0000 (21:28 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Sun, 15 Feb 2009 02:28:30 +0000 (21:28 -0500)

Trivial merge