[package-plan] 01/01: Merge branch 'master' into experimental

[Clint Adams]

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

clint pushed a commit to branch experimental
in repository package-plan.

commit 3cce0e1f83ba9c7af5a5790655954f11bb7dde6f
Merge: 9abf21d 008a579
Author: Clint Adams <clint at debian.org>
Date:   Wed Oct 26 18:18:36 2016 -0400

    Merge branch 'master' into experimental

 packages.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --cc packages.txt
index 93b5d7a,c72dbfe..bcdd9e3
--- a/packages.txt
+++ b/packages.txt
@@@ -265,18 -265,17 +265,18 @@@ ghc-mod 5.6.0.0 binar
  ghc-mtl 1.2.1.0
  ghc-paths 0.1.0.9
  ghc-syb-utils 0.2.3
 -gio 0.13.1.1
 -git-annex 6.20161012 binary key ahead -f-ConcurrentOutput
 +gio 0.13.3.0
- git-annex 6.20160923 binary key ahead obsolete -f-ConcurrentOutput # BROKEN - GHC8 via esqueleto/persistent
- github 0.14.1 # BROKEN - GHC8
- github-backup 1.20160522 binary key # BROKEN - GHC8 via github
- gitit 0.12.1.1 key # BROKEN - GHC8 (tagsoup)
++git-annex 6.20161012 binary key ahead obsolete -f-ConcurrentOutput # BROKEN - GHC8 via esqueleto/persistent
+ github 0.14.1
+ github-backup 1.20160522 binary key
+ gitit 0.12.1.1 key
  gitlib 3.1.1
  gitrev 1.2.0
 -glib 0.13.2.2
 -Glob 0.7.11
 -gloss 1.10.1.1 key
 -gloss-rendering 1.10.1.1
 +glib 0.13.4.0
 +glirc 2.20
 +Glob 0.7.12
 +gloss 1.10.2.3 key
 +gloss-rendering 1.10.3.3
  GLURaw 2.0.0.2
  GLUT 2.7.0.10
  gnuidn 0.2.2

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