[Pkg-javascript-commits] [node-bluebird] 02/04: Merge tag 'upstream/2.9.14+dfsg'

[Ross Gammon]

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

ross-guest pushed a commit to branch master
in repository node-bluebird.

commit a00942b04db2e590c400e37848773e582c45dbe3
Merge: 0e62a22 4bd78ac
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Mon Mar 16 17:41:34 2015 +0100

    Merge tag 'upstream/2.9.14+dfsg'
    
    Upstream version 2.9.14+dfsg
    
    # gpg: Signature made Mon 16 Mar 2015 05:41:22 PM CET
    # gpg:                using RSA key 0x733E6BF93CE8F6D9
    # gpg: Good signature from "Ross Gammon (Rosco) <rossgammon at mail.dk>"
    # gpg:                 aka "Ross Gammon (Genealogy) <genealogy at the-gammons.net>"
    # gpg:                 aka "Ross Gammon (www.one-name.org) <gammon at one-name.org>"
    # gpg:                 aka "Ross Gammon (www.the-gammons.net) <ross at the-gammons.net>"
    # gpg:                 aka "[jpeg image of size 3524]"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: FBEE 0190 904F 1EA0 BA6A  300E 53FE 7BBD A689 10FC
    #      Subkey fingerprint: 7AEE BC7A 44AB 8B90 5CA7  8FC6 733E 6BF9 3CE8 F6D9

 .jshintrc                   |  2 +-
 bower.json                  |  2 +-
 changelog.md                |  6 ++++++
 js/browser/bluebird.js      | 15 +++++----------
 package.json                |  2 +-
 src/schedule.js             | 13 ++++---------
 tools/jshintrc_generator.js |  1 +
 7 files changed, 19 insertions(+), 22 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-bluebird.git