[DRE-commits] [ruby-passenger] 01/04: Merge tag 'upstream/4.0.53'

[Felix Geyer]

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

fgeyer pushed a commit to branch master
in repository ruby-passenger.

commit 3261375a591e710c8982a79ddac21029da4ce2f3
Merge: 9665e05 bbc4320
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Oct 13 20:53:18 2014 +0200

    Merge tag 'upstream/4.0.53'
    
    Upstream version 4.0.53
    
    # gpg: Signature made Mo 13 Okt 2014 20:53:17 CEST using RSA key ID 83135D45
    # gpg: Good signature from "Felix Geyer <felix at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx-pkg at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx at kubuntu.org>"
    # gpg:                 aka "Felix Geyer <debfx at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx at ubuntu.com>"
    # gpg:                 aka "Felix Geyer <felix.geyer at fobos.de>"
    # gpg:                 aka "Felix Geyer <fgeyer at debian.org>"

 .editorconfig                                      |  20 +-
 CHANGELOG                                          |   8 +
 Rakefile                                           |   9 +-
 build/packaging.rb                                 | 102 ++-
 doc/Design and Architecture.html                   | 129 ++--
 doc/Security of user switching support.html        |  33 +-
 doc/Users guide Apache.html                        | 694 ++++++++++---------
 doc/Users guide Nginx.html                         | 740 ++++++++++-----------
 doc/Users guide Standalone.html                    | 406 ++++++-----
 doc/Users guide.html                               |  36 +-
 ext/common/Constants.h                             |   2 +-
 lib/phusion_passenger.rb                           |   6 +-
 lib/phusion_passenger/platform_info/ruby.rb        |  61 +-
 lib/phusion_passenger/ruby_core_enhancements.rb    |  15 +-
 .../stub/rails4.0/config/initializers/passenger.rb |   7 +-
 .../stub/rails4.1/config/initializers/passenger.rb |   2 +-
 16 files changed, 1164 insertions(+), 1106 deletions(-)

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