[DRE-commits] [jekyll] 03/17: Merge branch 'upstream'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository jekyll.

commit 65652112550b1762dbf135de9e9c5bf4bb47a8f7
Merge: 79b2641 c739150
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jun 5 09:30:32 2016 +0200

    Merge branch 'upstream'

 script/travis                    |   0
 site/_docs/upgrading.md~HEAD     | 140 ---------------------------------------
 site/_docs/upgrading.md~upstream |  10 ---
 3 files changed, 150 deletions(-)

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