Merge remote-tracking branch 'upstream/master' into 7.8.2-update

elfenlaid · elfenlaid · commit 09bc8570d45b · 2014-10-04T12:54:59.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,6 @@
+language: haskell
+ghc:
+  - 7.6
+  - 7.8
+script:
+  - cabal install --dependencies-only && cabal build

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +language: haskell
 +ghc:
 +  - 7.6
 +  - 7.8
 +script:
 +  - cabal install --dependencies-only && cabal build