From: Mark Otto <markdotto@gmail.com>
Date: Fri, 26 Sep 2014 04:41:05 +0000 (-0700)
Subject: Merge branch 'master' into sass
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=blog;a=commitdiff_plain;h=117ed984ed3458c4b0d0762dcc5f047c75fa5d02

Merge branch 'master' into sass
---

117ed984ed3458c4b0d0762dcc5f047c75fa5d02