Merge branch 'master' of https://github.com/haskell/filepath
authorNeil Mitchell <ndmitchell@gmail.com>
Tue, 22 Dec 2015 12:02:25 +0000 (12:02 +0000)
committerNeil Mitchell <ndmitchell@gmail.com>
Tue, 22 Dec 2015 12:02:25 +0000 (12:02 +0000)

Trivial merge