[DRE-commits] [diaspora] 04/05: Merge tag 'upstream/0.5.0.1+debian'

[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 bc7f0a700140ca28bc04ba2a2a05fb04ea121ac9
Merge: f1d2058 a3a115d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri May 8 23:26:07 2015 +0530

    Merge tag 'upstream/0.5.0.1+debian'
    
    Upstream version 0.5.0.1+debian
    
    # gpg: Signature made Friday 08 May 2015 11:26:01 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 Changelog.md                                | 4 ++++
 config/defaults.yml                         | 2 +-
 config/initializers/setup_simple_captcha.rb | 2 +-
 spec/configuration_methods_spec.rb          | 7 +++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

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