[DRE-commits] [jekyll] 02/06: Merge remote-tracking branch 'origin/master'

[dod at debian.org]

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

dod pushed a commit to branch master
in repository jekyll.

commit 37ab2ccbb9a2f9450e3c00e8ed7e6463a894a8c8
Merge: 6d32210 4b9d6dc
Author: Dominique Dumont <dod at debian.org>
Date:   Wed Apr 9 17:45:55 2014 +0200

    Merge remote-tracking branch 'origin/master'

 debian/control                                     |  35 +++--
 ...0001-Drop-coverage-simplecov-dependencies.patch |  26 ++++
 debian/patches/0001-Remove-RubyGems-Depends.patch  | 161 ---------------------
 debian/patches/0002-Drop-rubygems-Depends.patch    |  48 ++++++
 ...ix-Redcarpet-and-Test-Upstream-Issues-539.patch |  35 -----
 .../0003-Remove-RedGreen-Dependencies.patch        |  22 ---
 .../0003-use-colored-instead-of-colorator.patch    |  22 +++
 debian/patches/0004-Downcase-RedCloth.patch        |  24 +++
 debian/patches/series                              |   7 +-
 9 files changed, 149 insertions(+), 231 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/jekyll.git