From a1054261bf5a6083004b66ffc6cd44271aba1908 Mon Sep 17 00:00:00 2001
From: eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 23 Dec 2011 13:41:11 +0000
Subject: * Merged changes up to eAthena 15038.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15225 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Changelog-Trunk.txt')

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 19defb83e..a081b7329 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,9 @@
 Date (YYYY-MM-DD)
 	Added
 
+2011-12-22
+	* Fixed guild aura code not checking, whether the map of guild leader and member is the same (since r15037). [Ai4rei]
+	* Merged slightly modified guild aura optimization from rAthena (ra:15084, ra:15086). [Ai4rei]
 2011-12-19
 	* Changes to chat logging code. [Ai4rei]
 	- Moved log_config.chat checks into log_chat and replaced string chat types with an enumeration.
-- 
cgit v1.2.3-70-g09d2