]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
merge from dev/0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 4 Feb 2009 20:40:36 +0000 (15:40 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 4 Feb 2009 20:40:36 +0000 (15:40 -0500)

Trivial merge