Merge https://github.com/haskell/bytestring
authorSean <burton.seanr@gmail.com>
Mon, 2 Nov 2015 15:33:27 +0000 (15:33 +0000)
committerSean <burton.seanr@gmail.com>
Mon, 2 Nov 2015 15:33:27 +0000 (15:33 +0000)
commit1eff53d49f4566416cf108a7a6d74e1b58280761
tree1d4fb10a8c91c7e806f3a4cbaebcf7f8771a59ed
parentc72f64fe00be522b23a34c7882efae81eaee7796
parentdd3c07d115840d13482426a0084a39201eb6b6d4
Merge https://github.com/haskell/bytestring

Conflicts:
Data/ByteString.hs
bench/BenchAll.hs
Data/ByteString.hs
bench/BenchAll.hs