]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 28 Dec 2009 23:49:14 +0000 (15:49 -0800)
committerEvan Prodromou <evan@status.net>
Mon, 28 Dec 2009 23:49:14 +0000 (15:49 -0800)

Trivial merge