[commit: unix] encoding: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/unix into encoding (9bfa839)

[Max Bolingbroke]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/unix

On branch  : encoding

http://hackage.haskell.org/trac/ghc/changeset/9bfa83970ccdebd0c656c8fc28d5f7ea0f3d862e

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

commit 9bfa83970ccdebd0c656c8fc28d5f7ea0f3d862e
Merge: e73a32b... cdf2106...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Mon Apr 11 17:18:29 2011 +0100

    Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/unix into encoding

 unix.cabal |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)