[commit: packages/filepath] master: Merge branch 'isValid' of https://github.com/thomie/filepath into thomie-isValid (6ddfe0c)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/6ddfe0c2e73430342db97c0f73bb2fcb5a46b2db

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

commit 6ddfe0c2e73430342db97c0f73bb2fcb5a46b2db
Merge: ffcd007 bef533f
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Sun Oct 26 21:18:34 2014 +0000

    Merge branch 'isValid' of https://github.com/thomie/filepath into thomie-isValid
    
    Conflicts:
    	changelog.md



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

6ddfe0c2e73430342db97c0f73bb2fcb5a46b2db
 System/FilePath/Internal.hs | 9 +++++++--
 changelog.md                | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --cc changelog.md
index b62ac45,1637673..dc2f4c8
--- a/changelog.md
+++ b/changelog.md
@@@ -7,9 -7,9 +7,12 @@@
    * Bug fix: on Windows, `dropTrailingPathSeparator "/"` now returns `"/"`
      unchanged, instead of the normalised `"\\"`.
  
 +  * Bug fix: on Windows, `equalFilePath "C:\\" "C:"` now retuns `False`,
 +    instead of `True`.
 +
+   * Bug fix: on Windows, `isValid "\\\\\\foo"` now returns `False`, instead
+     of `True`.
+ 
  ## 1.3.0.2  *Mar 2014*
  
    * Bundled with GHC 7.8.1