Merge pull request #1896 from shackbarth/peg-lockdown
authorGil Moskowitz <gmoskowitz@xtuple.com>
Thu, 2 Oct 2014 14:08:11 +0000 (10:08 -0400)
committerGil Moskowitz <gmoskowitz@xtuple.com>
Thu, 2 Oct 2014 14:08:11 +0000 (10:08 -0400)
peg to patch of node

1  2 
package.json

diff --cc package.json
Simple merge