[Pkg-haskell-commits] [package-plan] 01/03: Merge branch 'master' into new-leksah

[Joachim Breitner]

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

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

commit bf55f9f3f13e5dfcd6045cf81fd9cafcef946abc
Merge: 701779b 11a4fc7
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Sep 22 13:07:14 2014 +0200

    Merge branch 'master' into new-leksah
    
    Conflicts:
    	packages.txt

 packages.txt                                       | 35 +++++++++++-----------
 patches/hledger-web/0.23.3/no-network-conduit.diff | 18 +++++++++++
 .../1.2.12.2 => hledger-web/0.23.3}/series         |  1 +
 .../{1.2.12.2 => 1.2.13}/no-network-conduit.diff   |  0
 patches/yesod-bin/{1.2.12.2 => 1.2.13}/series      |  0
 5 files changed, 37 insertions(+), 17 deletions(-)

diff --cc packages.txt
index b4f1530,7900386..777ef35
--- a/packages.txt
+++ b/packages.txt
@@@ -476,8 -473,8 +477,8 @@@ optparse-applicative 0.10.
  OSM 0.6.4
  pandoc 1.12.4.2 -fhttp-conduit group=new-binary
  pandoc-citeproc 0.3.0.1 -fbibutils -f-hexpat -funicode_collation group=new-binary
- pandoc-types 1.12.3.3
+ pandoc-types 1.12.4.1
 -pango 0.12.5.3
 +pango 0.13.0.0
  parallel 3.2.0.4
  parseargs 0.1.3.2
  parsec 3.1.3
@@@ -614,8 -610,8 +615,8 @@@ stringbuilder 0.4.
  stringprep 0.1.5
  stringsearch 0.3.6.5
  strptime 1.0.6
 -svgcairo 0.12.1
 +svgcairo 0.13.0.0
- swish 0.9.0.14
+ swish 0.9.0.15
  syb 0.4.0
  syb-with-class 0.6.1.5
  syb-with-class-instances-text 0.0.1

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