Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:12:24 +0000 (17:12 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:12:24 +0000 (17:12 +0000)
commitdf8e24be5da2f9a8b0bd86dbbd1b0bf508bac003
tree367ffc7df37dba1a01b5f15f625a7e14192571b4
parent5ebaf1e1cbee6097264b594dc66177cc1b6daaf2
parenteda183287489b2c705843aa373a19c4e46fb2fec
Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec'

* commit 'eda183287489b2c705843aa373a19c4e46fb2fec':
  travis: Enable OSX integration

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
.travis.yml