From: Mark Otto <otto@github.com>
Date: Thu, 2 Jan 2014 18:27:29 +0000 (-0800)
Subject: Merge branch 'master' into gh-pages
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=037a4bdf8aa6119d114b05ae87ddb413bd9a9894;p=blog

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

037a4bdf8aa6119d114b05ae87ddb413bd9a9894