[Pkg-javascript-commits] [node-moment] 02/06: Merge tag 'upstream/2.15.1+ds'

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository node-moment.

commit 8676b1166640ab7394c32f055490f7993dae1322
Merge: d2d5809 6132c1e
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Sep 28 17:01:57 2016 +0200

    Merge tag 'upstream/2.15.1+ds'
    
    Upstream version 2.15.1+ds

 CHANGELOG.md               |  4 ++++
 Moment.js.nuspec           | 12 ++++--------
 bower.json                 |  1 +
 component.json             |  2 +-
 meteor/package.js          |  4 +---
 min/moment-with-locales.js |  8 ++++----
 moment.js                  |  8 ++++----
 package.json               |  2 +-
 src/lib/locale/locales.js  |  4 ++--
 src/moment.js              |  4 ++--
 tasks/bump_version.js      | 15 ++++++++++++++-
 11 files changed, 38 insertions(+), 26 deletions(-)

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