From: Mark Otto <otto@github.com>
Date: Sun, 22 Jun 2014 22:54:12 +0000 (-0700)
Subject: Merge branch 'master' into gh-pages
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=85ce3b49e732fb7d381714596a474ce20ce97aa8;p=blog

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

85ce3b49e732fb7d381714596a474ce20ce97aa8