Merge pull request #1615 from gpazo/goodbyeJim
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Tue, 24 Jun 2014 19:04:58 +0000 (15:04 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Tue, 24 Jun 2014 19:04:58 +0000 (15:04 -0400)
commit6ed3e26d93cf5cb8338836d60f37cf2682e1a736
treea184064689c1133fedf6f87a67d55e65817ebeb3
parent3a9285b270f02a234fd4a37f13f1f4e4c15055ec
parentd69c5bd6b7c4161814ccd483ff0178ce00d36d72
Merge pull request #1615 from gpazo/goodbyeJim

fix my pull, go ahead and fix jim's too