From 65badb6a3e07eb7b59f0d28d79aa943ca1d179f2 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Tue, 5 May 2015 08:14:02 +0200
Subject: [PATCH] Changelog update.

---
 html/changelog.html                             | 10 ++++++++++
 html/changelogs/.all_changelog.yml              |  6 ++++++
 html/changelogs/PsiOmegaDelta-BrokenGrilles.yml |  4 ----
 html/changelogs/RavingManiac-master.yml         |  6 ------
 4 files changed, 16 insertions(+), 10 deletions(-)
 delete mode 100644 html/changelogs/PsiOmegaDelta-BrokenGrilles.yml
 delete mode 100644 html/changelogs/RavingManiac-master.yml

diff --git a/html/changelog.html b/html/changelog.html
index 134f72f306..e3cee7c713 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,16 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">05 May 2015</h2>
+			<h3 class="author">PsiOmegaDelta updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Grilles no longer return too many rods when destroyed (using means other than wirecutters).</li>
+			</ul>
+			<h3 class="author">RavingManiac updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Intent menu now appears while zooming with a sniper rifle.</li>
+			</ul>
+
 			<h2 class="date">02 May 2015</h2>
 			<h3 class="author">HarpyEagle updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 39de465d99..43c4d8658b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1704,3 +1704,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       when the ones on telecomms are destroyed. Assembly is required.
   - rscadd: Adds the emergency bluespace relay circuitboard to be researchable and
       printable in R&D, with sufficient tech levels.
+2015-05-05:
+  PsiOmegaDelta:
+  - tweak: Grilles no longer return too many rods when destroyed (using means other
+      than wirecutters).
+  RavingManiac:
+  - tweak: Intent menu now appears while zooming with a sniper rifle.
diff --git a/html/changelogs/PsiOmegaDelta-BrokenGrilles.yml b/html/changelogs/PsiOmegaDelta-BrokenGrilles.yml
deleted file mode 100644
index fec228bad6..0000000000
--- a/html/changelogs/PsiOmegaDelta-BrokenGrilles.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PsiOmegaDelta
-delete-after: True
-changes: 
-  - tweak: "Grilles no longer return too many rods when destroyed (using means other than wirecutters)."
diff --git a/html/changelogs/RavingManiac-master.yml b/html/changelogs/RavingManiac-master.yml
deleted file mode 100644
index e3a031deec..0000000000
--- a/html/changelogs/RavingManiac-master.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: RavingManiac
-delete-after: True
-
-changes: 
-  - tweak: "Candles now burn for about 30 minutes."
-  - tweak: "Intent menu now appears while zooming with a sniper rifle."