]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorEvan Prodromou <evan@status.net>
Wed, 4 May 2011 21:46:36 +0000 (14:46 -0700)
committerEvan Prodromou <evan@status.net>
Wed, 4 May 2011 21:46:36 +0000 (14:46 -0700)

Trivial merge