Matt Diephouse 9c7d3f97b6 Merge branch 'master' into belly-of-the-beast ... # Conflicts: # app/Main.hs		2016-02-02 11:58:59 -05:00
..
DiffOutput.hs	Merge branch 'master' into belly-of-the-beast	2016-02-02 11:58:59 -05:00
Main.hs	Remove unnecessary imports	2016-02-02 11:46:39 -05:00
Parsers.hs	Merge remote-tracking branch 'origin/master' into git-diff	2016-02-01 14:48:30 -05:00
SemanticDiff.hs	Restore changes lost from #402, #408, and #410	2016-02-02 11:46:31 -05:00