From bf6d2dcfbd517ed991cc3e01f354b7ea7a76b136 Mon Sep 17 00:00:00 2001
From: Reimar Twelker <Twelker@adesso-mobile.de>
Date: Wed, 13 Apr 2016 11:03:02 +0200
Subject: [PATCH] Added change summary to CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 809c9412b..7585f76a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,12 @@
   but that can change if users request it.  
   [JP Simard](https://github.com/jpsim)
 
+* Added the user-configurable option `ignores_empty_lines` to the
+  `trailing_whitespace` rule. It can be used to control whether the
+  `TrailingWhitespaceRule` should report and correct whitespace-indented empty
+  lines. Defaults to `false`. Added unit tests.  
+  [Reimar Twelker](https://github.com/raginmari)
+
 ##### Bug Fixes
 
 * Fix false positive in conditional binding cascade violation.