From a8b21a23bc1539cffdf17fbf8f949f335d79fe8b Mon Sep 17 00:00:00 2001
From: Ben Christensen <benjchristensen@gmail.com>
Date: Tue, 20 May 2014 10:25:55 -0700
Subject: [PATCH] Merge pull request #1228 from benjchristensen/fix-formatting

Git Reformats This File