[DRE-commits] [ruby-diaspora-federation-rails] 02/03: Merge tag 'upstream/0.0.6'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-diaspora-federation-rails.

commit b510550cf597e08f985f9c89744eba16b4d53817
Merge: 5a26bb5 471a170
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Sep 1 12:04:13 2015 +0530

    Merge tag 'upstream/0.0.6'
    
    Upstream version 0.0.6
    
    # gpg: Signature made Tuesday 01 September 2015 12:04:09 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>"

 README.md                                                  |  8 ++++----
 app/controllers/diaspora_federation/h_card_controller.rb   | 12 +++++++-----
 .../diaspora_federation/webfinger_controller.rb            | 14 ++++++++------
 metadata.yml                                               |  8 ++++----
 4 files changed, 23 insertions(+), 19 deletions(-)

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