]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Tue, 24 Mar 2009 14:40:16 +0000 (10:40 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Tue, 24 Mar 2009 14:40:16 +0000 (10:40 -0400)

Trivial merge