[commit: packages/filepath] master: Merge branch 'master' of https://github.com/haskell/filepath (ffcd007)

[git at git.haskell.org]

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

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

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

commit ffcd00736046445bd95f673e4e7a3a0ce65fe4d2
Merge: 598fa3d 1847583
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Sun Oct 26 21:12:20 2014 +0000

    Merge branch 'master' of https://github.com/haskell/filepath



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

ffcd00736046445bd95f673e4e7a3a0ce65fe4d2
 System/FilePath/Internal.hs | 7 ++-----
 changelog.md                | 3 +++
 2 files changed, 5 insertions(+), 5 deletions(-)