From: Edward Delaporte <edthedev@gmail.com>
Date: Mon, 9 Mar 2015 21:36:51 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/edthedev/dotfiles
X-Git-Url: https://apps.delaporte.us/gitweb/dotfiles.git/commitdiff_plain/6ec9bafb8ea448b7a1dd4499994787e0df51f96b?hp=6ec9bafb8ea448b7a1dd4499994787e0df51f96b

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

Conflicts:
	vimrc
---