From 58a55c994f0c355bbe31c8d6fe1b1c3902787beb Mon Sep 17 00:00:00 2001
From: Sree Kuchibhotla <sreek@google.com>
Date: Tue, 21 Jun 2016 16:31:08 -0700
Subject: [PATCH 1/2] Merge branch 'master' into epoll_changes_merged

---
 tools/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/package.json b/tools/package.json
index c34b259e..d4849c2e 100644
--- a/tools/package.json
+++ b/tools/package.json
@@ -34,7 +34,6 @@
     "index.js",
     "bin/protoc.js",
     "bin/protoc_plugin.js",
-    "bin/google/protobuf",
     "LICENSE"
   ],
   "main": "index.js"

From 3a086d555ccc2ee45c005f3c93cccd2e3a248b3f Mon Sep 17 00:00:00 2001
From: Sree Kuchibhotla <sreek@google.com>
Date: Fri, 24 Jun 2016 09:27:00 -0700
Subject: [PATCH 2/2] generate_projects.sh

---
 tools/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/package.json b/tools/package.json
index d4849c2e..c34b259e 100644
--- a/tools/package.json
+++ b/tools/package.json
@@ -34,6 +34,7 @@
     "index.js",
     "bin/protoc.js",
     "bin/protoc_plugin.js",
+    "bin/google/protobuf",
     "LICENSE"
   ],
   "main": "index.js"