Merge branch 'master' into gh-pages
authorMark Otto <markdotto@gmail.com>
Mon, 22 Jun 2015 00:11:51 +0000 (17:11 -0700)
committerMark Otto <markdotto@gmail.com>
Mon, 22 Jun 2015 00:11:51 +0000 (17:11 -0700)
commit84e75644dda47abc6a24f1bf332b863f518ab950
treea119f40725508ee36a1c0ecfc4343bb4aac75b53
parente5e4f6693dd954f6b79c13cd91cfcabdc80f23d8
parent021efcbe9bb7aaf260881cdccbd42f10f3394aab
Merge branch 'master' into gh-pages

Conflicts:
_includes/head.html
_includes/head.html