From 362bc060f6252280153f0f08d25c4ad1dd1319f1 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sat, 26 Dec 2015 14:12:15 -0500
Subject: [PATCH] fix merge mistake (4305a71916c8c566234c575e1806b769a5960c2a)

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b7c416a..156977da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,6 @@ System:
 * Fix pip command that might have not installed all necessary Python packages.
 * The control panel and backup would not work on Google Compute Engine because GCE installs a conflicting boto package.
 * Added a new command `management/backup.py --restore` to restore files from a backup to a target directory (command line arguments are passed to `duplicity restore`).
-* Update Roundcube to version 1.1.3.
 
 v0.14 (November 4, 2015)
 ------------------------