From: Adam A.G. Shamblin <adam.shamblin@gmail.com>
Date: Sun, 14 Jun 2015 16:57:15 +0000 (-0600)
Subject: Merge branch 'master' of github.com:coyote240/dotfiles
X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=8553e78c2303396e7b7fe44d2bdf26287c2116b2;p=dotfiles.git

Merge branch 'master' of github.com:coyote240/dotfiles
---

8553e78c2303396e7b7fe44d2bdf26287c2116b2