[DRE-commits] [ruby-diaspora-prosody-config] 03/03: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-diaspora-prosody-config

[Sruthi Chandran]

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

srud-guest pushed a commit to branch master
in repository ruby-diaspora-prosody-config.

commit 5a328144803b2b26cfc4948fe8c7666a02c4efd2
Merge: db34ad1 757ab55
Author: Sruthi <srud at disroot.org>
Date:   Tue Sep 6 13:59:17 2016 +0530

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-diaspora-prosody-config

 debian/changelog | 2 +-
 debian/install   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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