Merge branch 'master' of https://github.com/haskell/filepath v1.4.0.0
authorNeil Mitchell <ndmitchell@gmail.com>
Thu, 12 Mar 2015 18:56:22 +0000 (18:56 +0000)
committerNeil Mitchell <ndmitchell@gmail.com>
Thu, 12 Mar 2015 18:56:22 +0000 (18:56 +0000)

Trivial merge