From: Mark Otto <markdotto@gmail.com>
Date: Thu, 25 Sep 2014 17:55:45 +0000 (-0700)
Subject: Merge branch 'master' into gh-pages
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=blog;a=commitdiff_plain;h=e5e4f6693dd954f6b79c13cd91cfcabdc80f23d8

Merge branch 'master' into gh-pages
---

e5e4f6693dd954f6b79c13cd91cfcabdc80f23d8