From a7cbb89dfca8fe367301b444e1bcbf806c3c92c3 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 25 May 2016 15:42:05 -0700
Subject: [PATCH] Update history to reflect merge of #4942 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 62b5bee4..39d43f9c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,7 @@
 ### Forward Ports
 
   * From v3.1.4: Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid (#4941)
+  * Forward-port: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label (#4942)
 
 ### Development Fixes