From: Edward Delaporte <edthedev@gmail.com>
Date: Fri, 20 Mar 2015 02:21:26 +0000 (-0500)
Subject: Merge branches 'master' and 'master' of https://github.com/edthedev/dotfiles
X-Git-Url: https://apps.delaporte.us/gitweb/dotfiles.git/commitdiff_plain/b9efb54625e9a1ff50331a0344d2687ed17c2c34?hp=b9efb54625e9a1ff50331a0344d2687ed17c2c34

Merge branches 'master' and 'master' of https://github.com/edthedev/dotfiles

Conflicts:
	vimrc
---