[Debian-ha-commits] [corosync] 02/02: Merge branch 'master' of ssh://anonscm.debian.org/git/debian-ha/corosync

[Adrian Vondendriesch]

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

discostu-guest pushed a commit to branch master
in repository corosync.

commit 1327ae86d764ccbc4ebacafe345f8a997eef98eb
Merge: 1612618 5969581
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Wed May 27 18:17:38 2015 +0200

    Merge branch 'master' of ssh://anonscm.debian.org/git/debian-ha/corosync
    
    Conflicts:
    	debian/changelog
    	debian/corosync.default


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/corosync.git