Merge branch 'FreshRSS/dev' into dev

Conflicts:
	CHANGELOG

1 files changed, 0 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f3559ccc4..fea4e8871 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,6 @@
 ## 2015-xx-xx FreshRSS 1.1.1 (beta)
 
 * Features
-	* Support for PubSubHubbub for instant notifications from compatible Web sites.
 	* New option to detect and mark updated articles as unread.
 	* Support for internationalized domain name (IDN).
 * Misc.