]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'blacklisttable' into testing
authorEvan Prodromou <evan@status.net>
Thu, 25 Mar 2010 17:51:52 +0000 (13:51 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 25 Mar 2010 17:51:52 +0000 (13:51 -0400)

Trivial merge