Merge branch 'master' of https://github.com/haskell/filepath
authorNeil Mitchell <ndmitchell@gmail.com>
Sun, 26 Oct 2014 20:30:07 +0000 (20:30 +0000)
committerNeil Mitchell <ndmitchell@gmail.com>
Sun, 26 Oct 2014 20:30:07 +0000 (20:30 +0000)

Trivial merge