]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'meitar/0.7.x' into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 19:32:26 +0000 (14:32 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 19:32:26 +0000 (14:32 -0500)

Trivial merge