[Pkg-mono-svn-commits] [xsp] 05/10: Merge tag 'upstream/4.2'

[Jo Shields]

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

directhex pushed a commit to annotated tag debian/4.2-1
in repository xsp.

commit c6621177a4adeb309488c3a84dd5266a2b643c1e
Merge: 6269b91 1b3828a
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Nov 30 14:24:50 2015 +0000

    Merge tag 'upstream/4.2'
    
    Upstream version 4.2

 configure                          | 20 ++++++++++----------
 configure.ac                       |  2 +-
 src/Mono.WebServer.XSP/Makefile.am |  2 +-
 src/Mono.WebServer.XSP/Makefile.in |  2 +-
 src/Mono.WebServer/Makefile.am     |  2 +-
 src/Mono.WebServer/Makefile.in     |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/xsp.git