From b9d0ec96b199076a8addba923e6c781eefd26ae5 Mon Sep 17 00:00:00 2001
From: "johnsonmt88@gmail.com"
 <johnsonmt88@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sun, 26 Aug 2012 05:31:25 +0000
Subject: [PATCH] Woops, meant to do this last commit... Merged Trubble's
 changelog message in with Carn and Giacom's as they're on the same date.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4551 316c924e-a436-60f5-8080-3fe189b3f50e
---
 html/changelog.html | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index 3f3e11280f1..3367e4c4e19 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -48,16 +48,6 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
-
-<div class="commit sansserif">
-	<h2 class="date">August 25, 2012</h2>
-	<h3 class="author">trubble_bass updated:</h3>
-	<ul class="changes bgimages16">
-		<li class="tweak">Nerfed the Neurotoxin drink, it is now less effective than a stunbaton. But more effective than a Beepsky Smash.</li>
-		<li class="tweak">Updated descriptions on various cocktails to be more accurate or more relevant to the drink itself.</li>
-	</ul>
-</div>
-
 <div class="commit sansserif">
 	<h2 class="date">August 25, 2012</h2>
 	<h3 class="author">Carnwennan updated:</h3>
@@ -73,6 +63,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
 		<li class="tweak">AIs can add links to Telecommunication Machines. Added some cameras for areas that should have it but instead relied on cameras nearby for vision.</li>
 		<li class="tweak">Choking has been changed. You have to stand still while lethally choking someone. It takes time to get into that lethal choke. When you are lethaling choking someone, they are still concious until the lack of oxygen knocks them out.</li>
 	</ul>
+	<h3 class="author">trubble_bass updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Nerfed the Neurotoxin drink, it is now less effective than a stunbaton. But more effective than a Beepsky Smash.</li>
+		<li class="tweak">Updated descriptions on various cocktails to be more accurate or more relevant to the drink itself.</li>
+	</ul>
 </div>
 
 <div class="commit sansserif">