add the new multi-os-feature to .travis.yml
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
Merge branch 'master' of https://github.com/mimmi20/browscap into check-onmacosx
Merge branch 'master' of https://github.com/browscap/browscap into check-onmacosx
update from the master branch
fix tests
fix tests
update from the master branch