From: Mark Otto Date: Mon, 22 Jun 2015 00:13:16 +0000 (-0700) Subject: Merge branch 'master' into gh-pages X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=512002eaa78a74e3a0825ce487d124c951e52452;p=blog Merge branch 'master' into gh-pages --- 512002eaa78a74e3a0825ce487d124c951e52452