[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 9abf21d4da7baeb5aeb023a2326ca348097ed137
Merge: 28d1373 5ceb6c4
Author: Clint Adams <clint at debian.org>
Date:   Wed Oct 26 18:04:35 2016 -0400

    Merge branch 'master' into experimental

 packages.txt | 1 +
 1 file changed, 1 insertion(+)

diff --cc packages.txt
index e03262c,1773417..93b5d7a
--- a/packages.txt
+++ b/packages.txt
@@@ -469,11 -467,12 +469,12 @@@ lucid-svg 0.7.0.
  magic 1.1
  map-syntax 0.2.0.1
  markdown 0.1.14
 -math-functions 0.1.7.0
 +math-functions 0.2.0.2
  mbox 0.3.3
 -megaparsec 4.4.0
 -memoize 0.7
++megaparsec 5.0.1
 +memoize 0.8.1
  memory 0.13
 -MemoTrie 0.6.7
 +MemoTrie 0.6.7 ahead # BROKEN - GHC8 via newtype-generics
  mersenne-random-pure64 0.2.0.5
  microlens 0.4.7.0
  microlens-ghc 0.4.7.0

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