From 292299d43cda607cba55d70035b3b3a52c9d955a Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Fri, 28 Feb 2014 20:03:06 -0700
Subject: [PATCH] Merges are not noteworthy

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25268bf1b..10e634a35 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,9 +57,6 @@
 **ParrotParrot**:
 - Added `Original filename` variable to Sauce panel.
 
-**Zixaphir**:
-- Merge changes from Mayhem fork
-
 ### v1.3.9 
 *2014-02-20*