Merge pull request #322 from cmurphy/master
authorDaniele Sluijters <github@daenney.net>
Mon, 30 Jun 2014 16:59:10 +0000 (18:59 +0200)
committerDaniele Sluijters <github@daenney.net>
Mon, 30 Jun 2014 16:59:10 +0000 (18:59 +0200)
commitcf54221bd3e2b79474dc6c5cb4d6303f659eccfa
tree719694a5e42ad876778d5da9e94aceebd16c398f
parent4ee69d08f4c0b294f99b7e114b35489fdbad805d
parent9973ebc9498976cdb5ac1d4293f0fc9e69dc453c
Merge pull request #322 from cmurphy/master

Synchronize .travis.yml