[DRE-commits] [ruby-rails-assets-jquery-colorbox] 01/09: Merge tag 'upstream/1.6.3_dfsg'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-rails-assets-jquery-colorbox.

commit 97d72be0901f58e4569d9fa1f25549c8c57059a2
Merge: 04c2f39 7e95b5e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Sep 10 22:54:09 2015 +0530

    Merge tag 'upstream/1.6.3_dfsg'
    
    Upstream version 1.6.3~dfsg
    
    # gpg: Signature made Thursday 10 September 2015 10:54:04 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                                          |   7 +-
 .../jquery-colorbox/i18n/jquery.colorbox-he.js     |   4 +-
 ....colorbox-pt-br.js => jquery.colorbox-pt-BR.js} |   2 +-
 .../jquery-colorbox/i18n/jquery.colorbox-zh-TW.js  |   6 +-
 .../javascripts/jquery-colorbox/jquery.colorbox.js | 217 +++++++++++----------
 lib/rails-assets-jquery-colorbox.rb                |   2 +-
 lib/rails-assets-jquery-colorbox/version.rb        |   2 +-
 metadata.yml                                       |   6 +-
 8 files changed, 131 insertions(+), 115 deletions(-)

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