[Pkg-javascript-commits] [jquery-goodies] 02/09: Merge branch 'upstream'

[Marcelo Jorge Vieira]

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

metal pushed a commit to branch master
in repository jquery-goodies.

commit 582042f6b8d50bc11bb8daf5ac48b1d55c0a6f65
Merge: 8ff460b fc1bd72
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date:   Sat Jun 28 21:38:12 2014 -0300

    Merge branch 'upstream'

 cookie/CHANGELOG.md       |  8 ++++++
 cookie/MIT-LICENSE.txt    |  4 +--
 cookie/README.md          | 13 +++++++---
 cookie/bower.json         |  2 +-
 cookie/component.json     | 14 ++++++++++
 cookie/cookie.jquery.json |  2 +-
 cookie/jquery.cookie.js   | 30 ++++++++++-----------
 cookie/package.json       | 23 +++++++++++++++--
 cookie/test/tests.js      | 66 +++++++++++++++++++++++++++++++----------------
 9 files changed, 115 insertions(+), 47 deletions(-)

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