Fix git warning for real

Sigh.
Merge pull request #327 from steveklabnik/master

Fix git warning for real