Merge branch 'master' into parser-data

2016-03-28 02:20:53 -04:00
parent 21bb65ed4a 71bc721d0b
commit c183db1020
4 changed files with 2888 additions and 2614 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: c
-brances:
+branches:
    only:
        - master
 env: