[Pkg-javascript-commits] [node-browser-pack] 32/141: Merge branch 'master' of git://github.com/thlorenz/browser-pack

[Bastien Roucariès]

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

rouca pushed a commit to branch master
in repository node-browser-pack.

commit 0da32f2298933ff043dccd30718e84be1c32c51b
Merge: 28a395f 4a85335
Author: James Halliday <mail at substack.net>
Date:   Sat Mar 16 20:36:00 2013 -0700

    Merge branch 'master' of git://github.com/thlorenz/browser-pack

 index.js                     | 25 +++++++-------------
 package.json                 |  7 ++++--
 test/source-maps-existing.js | 56 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 19 deletions(-)


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