From: Adam A.G. Shamblin <adam.shamblin@gmail.com>
Date: Fri, 30 Jan 2015 21:55:44 +0000 (-0700)
Subject: Merge branch 'master' of github.com:coyote240/dotfiles
X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=46f7bdb9362b0b5b9851c33e9fb7b23d875fb0c1;p=dotfiles.git

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

46f7bdb9362b0b5b9851c33e9fb7b23d875fb0c1