Merge branch 'master' of https://github.com/makoshark/redirect-tools
authoraaronshaw <aaron.d.shaw@gmail.com>
Wed, 2 Jul 2014 18:26:02 +0000 (13:26 -0500)
committeraaronshaw <aaron.d.shaw@gmail.com>
Wed, 2 Jul 2014 18:26:02 +0000 (13:26 -0500)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?