]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Wed, 1 Sep 2010 18:21:36 +0000 (14:21 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 1 Sep 2010 18:21:36 +0000 (14:21 -0400)

Trivial merge