Merge pull request #1879 from Tintazul/master
commit133d15b89da2e92ba07a5c62d6fbe54df6cf1d6f
authorSean Cannella <sean.cannella@gmail.com>
Fri, 21 Feb 2014 16:55:42 +0000 (21 08:55 -0800)
committerSean Cannella <sean.cannella@gmail.com>
Fri, 21 Feb 2014 16:55:42 +0000 (21 08:55 -0800)
tree8df2b6bcae66cc96b16f23003e3d9298de6e945d
parent324ee931031bc05304de3b85369031791c4902ed
parent3a32cdf5e76e5254f08602b81f0335430ee5ed2a
Merge pull request #1879 from Tintazul/master

Update .travis.yml