From 2c7e6ba414994fd38c4e494a15e1de3ea8d46032 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@c9.io>
Date: Wed, 8 Apr 2015 09:34:51 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into docker-ci2

---
 .gitignore   | 1 +
 package.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1d4bcfff..5b0b4700 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@ plugins/c9.proxy/haproxy-*
 npm-debug.log
 foo.js
 hello.js
+plugins/c9.docker/containers/ci/files/github_c9_newclient
\ No newline at end of file
diff --git a/package.json b/package.json
index a969b56d..e33c8f83 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
         "c9.ide.find.infiles": "#1b83cf12f1",
         "c9.ide.find.replace": "#e4daf722b8",
         "c9.ide.run.debug": "#638e6b00b3",
+        "c9.automate": "#86bf1ee1ca",
         "c9.ide.ace.emmet": "#e5f1a92ac3",
         "c9.ide.ace.gotoline": "#4d1a93172c",
         "c9.ide.ace.keymaps": "#6c4bb65b1f",