From c7b6d789ca87a07fcda3c97141e9a601300e5631 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Wed, 30 Oct 2013 20:16:22 +1100
Subject: [PATCH] DOC: add ChangeLog for #392

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e98bcaa61..bd668a71f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,6 +76,8 @@ ver. 0.8.11 (2013/XX/XXX) - loves-unittests
   François Boulogne and Frédéric
    * filter.d/lighttpd - auth regexs for lighttpd-1.4.31
   Daniel Black
+   * reorder parsing of jail.conf, jail.d/*.conf, jail.local, jail.d/*.local
+     and likewise for fail2ban.{conf|local|d/*.conf|d/*.local}. Closes gh-392
    * jail.conf now has asterisk jail - no need for asterisk-tcp and
 	   asterisk-udp. Users should replace existing jails with asterisk to 
 		 reduce duplicate parsing of the asterisk log file.