sstjohn/sjwautoblocker — pull request #38 by riking (2014-12-03 00:54:53+00:00)
Title: Resolved merge conflicts for PRs #8-36

This is the combination of pull requests #8 through #36.