Merge pull request #105 from ebraminio/master
authorBehdad Esfahbod <behdad@behdad.org>
Thu, 7 May 2015 17:46:42 +0000 (10:46 -0700)
committerBehdad Esfahbod <behdad@behdad.org>
Thu, 7 May 2015 17:46:42 +0000 (10:46 -0700)
Fix Travis CI config to pass again


Trivial merge