[Debian-ha-commits] [cluster-glue] 02/02: Merge remote-tracking branch 'origin/master'

[Richard Winters]

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

devrik-guest pushed a commit to branch master
in repository cluster-glue.

commit 3fb837e8cfc9bc9ead6ba376c4f0268958c5a758
Merge: faf4ab4 fe7846a
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu Apr 16 17:03:07 2015 -0400

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/control

 debian/control | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --cc debian/control
index 1764d66,ae902b7..f606609
--- a/debian/control
+++ b/debian/control
@@@ -11,8 -11,8 +11,7 @@@ Build-Depends: debhelper (>= 7)
   asciidoc, 
   autoconf, 
   automake, 
-- bison, 
-  chrpath,
 - chrpath,  
++ bison,
   dh-autoreconf,
   docbook-xsl, 
   docbook-xml,

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