Upstream merge

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0039-Allow-Disabling-of-Random-Lighting-Updates.patch

@@ -1,14 +1,14 @@
-From 2155a9e89454ee4120c716bcdc3b744e243ec84b Mon Sep 17 00:00:00 2001
+From 36cb297c394d629e8be30555a40d919481919e6e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3bcca91..efe7ca5 100644
+index 10efeef..2fd6a43 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -895,7 +895,7 @@ public class Chunk {
+@@ -906,7 +906,7 @@ public class Chunk {
          }
  
          this.m = true;