[Pkg-haskell-commits] [package-plan] 02/07: Merge remote-tracking branch 'origin/master' into ghc-7.8

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch ghc-7.8
in repository package-plan.

commit c950142d9e892adf4658b5dea5030a25fa991672
Merge: 76a2248 fc1d630
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Dec 21 12:15:22 2014 +0100

    Merge remote-tracking branch 'origin/master' into ghc-7.8
    
    Conflicts:
    	packages.txt

 packages.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --cc packages.txt
index c6e0f69,3054f4d..7dcc12b
--- a/packages.txt
+++ b/packages.txt
@@@ -19,21 -19,20 +19,22 @@@ asn1-encoding 0.8.1.
  asn1-parse 0.8.1
  asn1-types 0.2.3
  async 2.0.1.5
 -attoparsec 0.10.4.0
 -attoparsec-enumerator 0.3.1
 +attoparsec 0.12.1.2
 +attoparsec-conduit 1.1.0
 +attoparsec-enumerator 0.3.3
  augeas 0.6.1
  authenticate 1.3.2.9
 -authenticate-oauth 1.4.0.8
 -aws 0.9.2
 +authenticate-oauth 1.5
 +auto-update 0.1.2
 +aws 0.10.5
  base16-bytestring 0.1.1.6
  base64-bytestring 1.0.0.1
 +base-compat 0.5.0
  base-unicode-symbols 0.2.2.4
 -basic-prelude 0.3.8
 +basic-prelude 0.3.10
+ bencode 0.5
  bifunctors 4.1.1.1
 -binary 0.7.2.1 notest ghcpkg group=new-binary
 -binary-communicator 1.0.2.1
 +binary-communicator 1.0.2.1 obsolete
  binary-shared 0.8.3
  bindings-DSL 1.0.21
  bindings-gpgme 0.1.4
@@@ -676,7 -659,8 +677,8 @@@ th-reify-many 0.1.
  time-compat 0.1.0.3
  TinyURL 0.1.0
  tls 1.2.9
 -tokyocabinet-haskell 0.0.5
 +tokyocabinet-haskell 0.0.5 obsolete
+ torrent 10000.0.0
  transformers 0.3.0.0
  transformers-base 0.4.1
  transformers-compat 0.3.3.3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git