Merge branch 'SeanRBurton-master'
authorDuncan Coutts <duncan@community.haskell.org>
Thu, 1 Sep 2016 13:31:24 +0000 (14:31 +0100)
committerDuncan Coutts <duncan@community.haskell.org>
Thu, 1 Sep 2016 13:31:24 +0000 (14:31 +0100)
commit18115dd82d05b95545c8547691294c1354fcf73a
tree50a734b5b4205840c64ffc94936f89870e48dabc
parentacff1898d6de16014eb6ad492260aa0ef8076705
parent5dd1ccc79f1500e01e0c1108bcbe0405bc853ac9
Merge branch 'SeanRBurton-master'