From 56eb08ea7e187b9ecdc0df4efd5dc1f9b7d0b09b Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Mon, 6 Apr 2015 23:30:19 +0200
Subject: [PATCH] docs: Update changelog after rebase

---
 docs/changelog.rst | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d161400e..4595587d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,14 +4,6 @@ Changelog
 
 This changelog is used to track all major changes to Mopidy.
 
-v1.0.1 (unreleased)
-===================
-
-Core
-----
-
-- Update core controllers to handle backend exceptions in all calls that rely
-  on multiple backends. (Issue: :issue:`667`)
 
 v1.1.0 (UNRELEASED)
 ===================
@@ -22,6 +14,9 @@ Core API
 - Calling :meth:`mopidy.core.library.LibraryController.search`` with ``kwargs``
   as the query is no longer supported (PR: :issue:`1090`)
 
+- Update core controllers to handle backend exceptions in all calls that rely
+  on multiple backends. (Issue: :issue:`667`)
+
 Internal changes
 ----------------