Merge branch 'normalise' of https://github.com/thomie/filepath into thomie-normalise
authorNeil Mitchell <ndmitchell@gmail.com>
Sun, 26 Oct 2014 21:41:11 +0000 (21:41 +0000)
committerNeil Mitchell <ndmitchell@gmail.com>
Sun, 26 Oct 2014 21:41:11 +0000 (21:41 +0000)
commitc30d7224b3a648f2bdb0d0e19140f1a273f7cb06
treeec8f865b4b0f514d7e3cde0d8dc2a87fc3871068
parent72543cc23359c78dee147d48c56e953e0a2eb794
parenteca255a41c6e6cf427f22f468f5c051ecad3d4e3
Merge branch 'normalise' of https://github.com/thomie/filepath into thomie-normalise

Conflicts:
System/FilePath/Internal.hs
changelog.md
System/FilePath/Internal.hs
changelog.md