[commit: packages/unix] master: Merge branch 'ghc-7.8' (53dec0e)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/53dec0eaa542a9e3062e39fad2b60102440a6291/unix

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

commit 53dec0eaa542a9e3062e39fad2b60102440a6291
Merge: f4d0e10 dc0e771
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Mar 22 17:37:02 2014 +0100

    Merge branch 'ghc-7.8'
    
    Re-unite branches which diverged for now good reason
    
    Conflicts:
    	changelog.md



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

53dec0eaa542a9e3062e39fad2b60102440a6291
 changelog.md |   10 ++++++++--
 unix.cabal   |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)