[DRE-commits] [ruby-fog] 02/03: Merge remote-tracking branch 'origin/master'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-fog.

commit 9a5661efdddcd038bfe5d5518f136adfd9b56ca0
Merge: 7b3a4f8 0c05e3c
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Dec 20 15:09:42 2015 +0530

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

 debian/changelog | 6 +++---
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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