[DRE-commits] [jekyll] 03/05: Merge tag 'upstream/1.5.1'

[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 3fdb081a10d7572e6c761537de5428bddff5295e
Merge: 2c61913 3d02af9
Author: Dominique Dumont <dod at debian.org>
Date:   Fri Apr 18 14:13:54 2014 +0200

    Merge tag 'upstream/1.5.1'
    
    Upstream version 1.5.1
    
    # gpg: Signature made Fri 18 Apr 2014 02:13:51 PM CEST using RSA key ID 49AB2B6C
    # gpg: Good signature from "Dominique Dumont <domi.dumont at free.fr>"
    # gpg:                 aka "Dominique Dumont (CPAN) <ddumont at cpan.org>"
    # gpg:                 aka "Dominique Dumont (HP-GNB) <domi at komarr.gre.hp.com>"
    # gpg:                 aka "Dominique Dumont (HP-SEA) <dominique.dumont at hp.com>"
    # gpg:                 aka "Dominique Dumont (Debian) <dod at debian.org>"
    # gpg:                 aka "Dominique Dumont <dominique.dumont at palm.com>"

 History.markdown                                   |  22 ++++
 README.markdown                                    |  12 +-
 checksums.yaml.gz                                  | Bin 270 -> 266 bytes
 features/support/env.rb                            |   4 +-
 jekyll.gemspec                                     |  13 ++-
 lib/jekyll.rb                                      |  15 ++-
 lib/jekyll/page.rb                                 |   4 +-
 lib/jekyll/post.rb                                 |   4 +-
 metadata.yml                                       | 128 +++++++++++----------
 .../2013-07-24-jekyll-1-1-1-released.markdown      |   6 +-
 .../2014-03-24-jekyll-1-5-0-released.markdown      |  19 +++
 .../2014-03-27-jekyll-1-5-1-released.markdown      |  26 +++++
 site/docs/history.md                               |  24 +++-
 test/test_path_sanitization.rb                     |  18 +++
 14 files changed, 208 insertions(+), 87 deletions(-)

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