[DRE-commits] [ruby-omniauth-tumblr] 01/03: Merge tag 'upstream/1.2'

[Praveen Arimbrathodiyil]

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

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

commit 87fc67c0538480daba78c818acd91ed65c50a05a
Merge: 7787cc0 6ad4f84
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Mar 4 21:03:53 2016 +0530

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2
    
    # gpg: Signature made Friday 04 March 2016 09:03:46 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>"

 .ruby-version                           |   1 +
 Gemfile                                 |   2 +-
 Gemfile.lock                            |  23 ++++---
 README.md                               |   2 +
 lib/omniauth-tumblr/version.rb          |   2 +-
 lib/omniauth/strategies/tumblr.rb       |   2 +-
 metadata.yml                            | 114 ++++++++++++++++++++++++++++++++
 spec/omniauth/strategies/tumblr_spec.rb |   2 +-
 8 files changed, 134 insertions(+), 14 deletions(-)

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