[jenkins-remoting] 03/03: Merge remote-tracking branch 'origin'

[James Downing Page]

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

jamespage pushed a commit to branch master
in repository jenkins-remoting.

commit 8cf31811f376f36c5054dbf582cf135b6dad1f60
Merge: 59d0368 fad8007
Author: James Page <james.page at ubuntu.com>
Date:   Sun Jan 26 19:33:58 2014 +0000

    Merge remote-tracking branch 'origin'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/remove-findbugs.patch


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