[DRE-commits] [diaspora] 01/02: Merge tag 'upstream/0.6.0.1'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit de17074f0d47a255beb48e4fd260ed1bb08f41bf
Merge: 5038530 0af6aa9
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jan 17 13:38:01 2017 +0530

    Merge tag 'upstream/0.6.0.1'
    
    Upstream version 0.6.0.1
    
    # gpg: Signature made Tue 17 Jan 2017 01:38:00 PM IST
    # gpg:                using RSA key 2A7974AE2FC152D77867DA4ACE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 Changelog.md          | 4 ++++
 config/application.rb | 2 +-
 config/defaults.yml   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

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