Merge branch 'master' of github.com:bioperl/bioperl-live
commitbbff097a8be55c3c6e79f7e1832203a43623fe55
authorChris Fields <cjfields@illinois.edu>
Fri, 8 Jul 2016 00:50:05 +0000 (7 19:50 -0500)
committerChris Fields <cjfields@illinois.edu>
Fri, 8 Jul 2016 00:50:05 +0000 (7 19:50 -0500)
tree4c6ff8d860f1af5185b803c7f55d733e559fdc29
parentf522077962542333c1dd542549b3fe29184017c4
parent31235916bcf07b8736512ecbaa8575e693096daf
Merge branch 'master' of github.com:bioperl/bioperl-live

Resolve small collision with .travis.yml stuff
.travis.yml