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

[Joachim Breitner]

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

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

commit 2fbc3c42f91c758cc512a682716cc9988393d478
Merge: cd8feb2 bf0d711
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Nov 3 16:49:42 2015 +0100

    Merge branch 'master' into experimental

 packages.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc packages.txt
index 41a0cdd,96c1aad..1a93d5f
--- a/packages.txt
+++ b/packages.txt
@@@ -246,12 -241,12 +246,12 @@@ ghc-mtl 1.2.1.
  ghc-paths 0.1.0.9
  ghc-syb-utils 0.2.3
  gio 0.13.1.0
- git-annex 5.20151019  binary key ahead
+ git-annex 5.20151019 binary key ahead
  github 0.13.2
- github-backup 1.20150618 binary key
+ github-backup 1.20150807 binary key
 -gitit 0.10.7 key
 -gitlib 3.1.0.1
 -gitrev 1.0.0
 +gitit 0.11.1.1 key
 +gitlib 3.1.0.2
 +gitrev 1.1.0
  glib 0.13.2.1
  Glob 0.7.5
  gloss 1.9.3.1 key
@@@ -727,12 -707,12 +727,12 @@@ word8 0.1.
  word-trie 0.3.0
  X11 1.6.1.2
  X11-xft 0.3.1
 -x509 1.5.1
 -x509-store 1.5.0
 -x509-system 1.5.0
 -x509-util 1.5.0 binary key
 -x509-validation 1.5.2
 +x509 1.6.0
 +x509-store 1.6.0
 +x509-system 1.6.0
 +x509-util 1.5.2 binary key obsolete
 +x509-validation 1.6.0
- xcb-types 0.7.0
+ xcb-types 0.7.1
  xcffib 0.3.6 binary=python-xcffib key
  xdg-basedir 0.2.2
  xml 1.3.14

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