[maven-debian-helper] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/maven-debian-helper

[James Downing Page]

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

jamespage pushed a commit to branch master
in repository maven-debian-helper.

commit 1e5a97e70bb9c0b3b251d31baae3f3be7a9b9c87
Merge: db88057 52178df
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 12 16:09:12 2013 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-java/maven-debian-helper
    
    Conflicts:
    	debian/changelog


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