Merge branch 'master' into IntMapGeneralMerge
authorwren romano <wren@community.haskell.org>
Sun, 11 Dec 2016 22:19:44 +0000 (14:19 -0800)
committerwren romano <wren@community.haskell.org>
Sun, 11 Dec 2016 22:19:44 +0000 (14:19 -0800)
commit4ebbf29ba195010a692e74ab00f467cd5610465a
treead23bf83cd6c4f1cdd8b16b3ea45c22320203117
parentf6ceb8ce04e08bbdc3bb7a023879a589ae01a7e5
parent8b21238136403506c1c3ed1f6bdbb319ad5c3f80
Merge branch 'master' into IntMapGeneralMerge