~brightbox/ruby-passenger/deb-nginx

Viewing all changes in revision 37.

  • Committer: John Leach
  • Date: 2013-02-01 13:52:25 UTC
  • mfrom: (0.1.101)
  • Revision ID: git-v1:94cd641a4743b6acb5dd89d84b09ee7a95ab853b
Merge remote-tracking branch 'debian/master'

Conflicts:
        CHANGES
        CHANGES.ru
        auto/install
        auto/lib/libatomic/make
        auto/lib/perl/make
        debian/changelog
        debian/modules/naxsi/naxsi_src/naxsi_runtime.c
        debian/rules
        src/core/nginx.h
        src/event/ngx_event_openssl.c
        src/http/modules/perl/nginx.pm
        src/http/ngx_http_variables.c

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: