[Pkg-javascript-commits] [node-browserify-aes] 16/92: merge

[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-browserify-aes.

commit 67b97dc84124ce439dbd55bc6a7454b47e4d2468
Merge: 6eb73ca 6d117a8
Author: Calvin Metcalf <cmetcalf at appgeo.com>
Date:   Fri Oct 17 08:20:07 2014 -0400

    merge

 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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