From 8ad423bb4487e1b921ed7bafd10f1f49d7d647b0 Mon Sep 17 00:00:00 2001
From: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date: Wed, 26 Sep 2012 21:02:51 +1000
Subject: [PATCH] update changelog

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
---
 html/changelog.html | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/html/changelog.html b/html/changelog.html
index a21d4b9bb64..e53b02ed9e8 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -58,10 +58,18 @@ should be listed in the changelog upon commit though. 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">September 22nd, 2012</h2>
+	<h2 class="date">September 26nd, 2012</h2>
 	<h3 class="author">Cael_Aislinn updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="rscadd">Merge current BS12 code with /tg/station's rev4736. See <a href="https://code.google.com/p/tgstation13/source/list">https://code.google.com/p/tgstation13/source/list</a> for tg's changelog. This is recommended reading for anyone interested in any changes, be warned there's a lot of them. 
+		<li class="experiment">Merge current BS12 code with /tg/station's rev4758. Thanks for everyone who's been posting issues and bugs to the PiratePad <a href="http://piratepad.net/YO3Dig6L2N">issue tracker</a>.
+		<li class="rscadd">See <a href="https://code.google.com/p/tgstation13/source/list">https://code.google.com/p/tgstation13/source/list</a> for tg's changelog. This is recommended reading for anyone interested in any changes, be warned there's a lot of them. 
+	</ul>
+</div>
+<div class="commit sansserif">
+	<h2 class="date">September 23nd, 2012</h2>
+	<h3 class="author">Cael_Aislinn updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">The server map has now officially branched to tgstation2.0.9.1.dmm.
 	</ul>
 </div>
 
@@ -69,7 +77,7 @@ should be listed in the changelog upon commit though. Thanks. -->
 	<h2 class="date">August 22, 2012</h2>
 	<h3 class="author">Cael_Aislinn updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="rscadd">This server is running a merge of BS12 and up to date TGcode. This is a significant update, and there will likely be several bugs coming with it. 
+		<li class="rscadd">This server is in the process of running a merge of BS12 and up to date TGcode. This is a significant update, and there will likely be several bugs coming with it. 
 		See <a href="https://github.com/Baystation12/Baystation12/pull/1671">https://github.com/Baystation12/Baystation12/pull/1671</a> for more information.</li>
 		<li class="rscadd">The server is now running tgstation2.0.9.dmm. The station layout is functionally the same, but with significant additions from tg. Hopefully, the Antiqua will be ready soon.</li>
 		<li class="bugfix">Please report all bugs immediately, both in OOC and by making an issue at: <a href="https://github.com/Baystation12/Baystation12/issues/new">https://github.com/Baystation12/Baystation12/issues/new</a></li>