Merge branch 'stable'

borsboom · borsboom · commit 67f0f0311164 · 2016-01-10T08:13:03.000-08:00
diff --git a/stack.cabal b/stack.cabal
@@ -185,7 +185,7 @@ library
                    , split
                    , stm >= 2.4.4
                    , streaming-commons >= 0.1.10.0
-                   , tar >= 0.4.1.0
+                   , tar >= 0.4.1.0 && < 0.6
                    , template-haskell >= 2.9.0.0
                    , temporary >= 1.2.0.3
                    , text >= 1.2.0.4
