From: Mark Otto <otto@github.com>
Date: Tue, 1 Apr 2014 17:48:03 +0000 (-0700)
Subject: Merge branch 'master' into gh-pages
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=1062a8638f263639d6674c74a3ff7f1b5afc7664;p=blog

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

1062a8638f263639d6674c74a3ff7f1b5afc7664