]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Sat, 16 Jan 2010 16:06:02 +0000 (08:06 -0800)
committerEvan Prodromou <evan@status.net>
Sat, 16 Jan 2010 16:06:02 +0000 (08:06 -0800)

Trivial merge