Test Travis
Merge branch 'master' of github.com:dieterdemeyer/puppet-adium
Integration of boxen testing framework