[commit: packages/bytestring] master: Merge branch 'SeanRBurton-master' (18115dd)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/bytestring

On branch  : master
Link       : http://git.haskell.org/packages/bytestring.git/commitdiff/18115dd82d05b95545c8547691294c1354fcf73a

>---------------------------------------------------------------

commit 18115dd82d05b95545c8547691294c1354fcf73a
Merge: acff189 5dd1ccc
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Thu Sep 1 14:31:24 2016 +0100

    Merge branch 'SeanRBurton-master'



>---------------------------------------------------------------

18115dd82d05b95545c8547691294c1354fcf73a
 Data/ByteString.hs                  | 49 +++++++++++++++++--------------------
 Data/ByteString/Builder/Internal.hs |  4 +--
 Data/ByteString/Char8.hs            | 29 +++++++++++-----------
 Data/ByteString/Internal.hs         | 32 ++++++++++++------------
 Data/ByteString/Lazy.hs             | 36 +++++++++++++--------------
 Data/ByteString/Lazy/Char8.hs       | 28 ++++++---------------
 Data/ByteString/Lazy/Internal.hs    | 11 ++++-----
 Data/ByteString/Short/Internal.hs   | 16 +++++-------
 tests/Properties.hs                 |  4 +--
 9 files changed, 92 insertions(+), 117 deletions(-)