Merge branch 'master' into fix-stray-simple

rakshasa · Mar 9, 2016 · a975804 · a975804
2 parents 3edeb36 + adf4a32
commit a975804
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/.travis → .travis.yml b/.travis → .travis.yml