[stapler] 09/09: Merge branch 'patch-queue/master' of git+ssh://git.debian.org/git/pkg-java/stapler into patch-queue/master

[James Downing Page]

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

jamespage pushed a commit to branch patch-queue/master
in repository stapler.

commit f90edac8783aaa600b047512267ce96d359f5fa1
Merge: 255da1a 039c78f
Author: James Page <james.page at ubuntu.com>
Date:   Thu Jan 2 13:11:45 2014 +0000

    Merge branch 'patch-queue/master' of git+ssh://git.debian.org/git/pkg-java/stapler into patch-queue/master
    
    Conflicts:
    	core/pom.xml
    	core/src/main/java/org/kohsuke/stapler/ResponseImpl.java
    	core/src/main/java/org/kohsuke/stapler/StaplerResponse.java


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/stapler.git