Rob Rix 62196878fa Merge branch 'master' into ghc8 ... # Conflicts: # semantic-diff.cabal # src/Diff.hs # src/Term.hs # src/Term/Arbitrary.hs # stack.yaml # tools/semantic-git-diff/src/SemanticDiff.hs		2016-09-14 16:12:47 -04:00
..
gitlib@77df9cce6b	++gitlib	2016-06-15 10:30:58 -07:00
text-icu@75e6147958	++text-icu	2016-09-14 09:16:54 -04:00
tree-sitter-parsers@ec7200f6af	++tree-sitter-parsers	2016-08-19 14:37:13 -04:00