]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into noactor
authorEvan Prodromou <evan@status.net>
Wed, 29 Dec 2010 23:29:29 +0000 (15:29 -0800)
committerEvan Prodromou <evan@status.net>
Wed, 29 Dec 2010 23:29:29 +0000 (15:29 -0800)

Trivial merge