From 2f7ff90ecc813674753580e53253a7a38b5e0712 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Sun, 31 Jul 2016 13:59:19 -0400
Subject: [PATCH] Update upstream

---
 BungeeCord                                         | 2 +-
 BungeeCord-Patches/0001-POM-Changes.patch          | 2 +-
 BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/BungeeCord b/BungeeCord
index b5121db..a605c1a 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit b5121db88699fa8ec252e4cb8238dc03e0f33593
+Subproject commit a605c1acbc413c2cf901d869e8c9a2ec7d3da4f4
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 08b63f3..e9fe5d6 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -567,7 +567,7 @@ index 53d3db1..ead929e 100644
 +
      <properties>
          <build.number>unknown</build.number>
-         <netty.version>4.0.39.Final</netty.version>
+         <netty.version>4.0.40.Final</netty.version>
 -        <maven.compiler.source>1.7</maven.compiler.source>
 -        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- Require Java 8 -->
diff --git a/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch b/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch
index 10ae956..4d204ab 100644
--- a/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch
+++ b/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch
@@ -14,7 +14,7 @@ index ead929e..bd19538 100644
  
      <properties>
          <build.number>unknown</build.number>
--        <netty.version>4.0.39.Final</netty.version>
+-        <netty.version>4.0.40.Final</netty.version>
 +        <netty.version>4.1.3.Final</netty.version>
          <!-- Require Java 8 -->
          <maven.compiler.source>1.8</maven.compiler.source>