[DRE-commits] [ruby-dbi] 08/08: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-dbi

[David Suárez]

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

deiv-guest pushed a commit to branch master
in repository ruby-dbi.

commit 32ae48f5d0b0b1e3be0b3a769414e3742c8879eb
Merge: 8948efc 7801c7a
Author: David Suárez <david.sephirot at gmail.com>
Date:   Fri Feb 21 21:33:38 2014 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-dbi
    
    Conflicts:
    	debian/control


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-dbi.git