From 6fa93f243f738e8c6a46a823e783d49781f68f2c Mon Sep 17 00:00:00 2001
From: badcaptain <bad_captain@yahoo.com>
Date: Tue, 2 Apr 2013 19:17:28 -0400
Subject: [PATCH] Merged from Master & changelog.

---
 changelog.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 07c89cf11..254c262ea 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,10 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
 
+== 04/2/2013 ==
+Bad_Captain: Fixed Merc lack of use of heal over time spells (causing excessive healing).
+Bad_Captain: Fixed pet mitigation/AC issues.
+
 == 04/01/2013 ==
 demonstar55: AA reuse timers now start when you hit the button and are reset upon failure
 demonstar55: Instant Cast bard AAs can now be used while singing a song