Merge remote-tracking branch 'origin/master'
[aquarium] / .travis.yml
2012-07-04 Christos KK LoverdosAdd support for travis-ci