]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'devevan/master' into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Thu, 12 Feb 2009 20:51:34 +0000 (15:51 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Thu, 12 Feb 2009 20:51:34 +0000 (15:51 -0500)

Trivial merge