]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Fri, 22 Jan 2010 19:18:40 +0000 (14:18 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 22 Jan 2010 19:18:40 +0000 (14:18 -0500)

Trivial merge