From e637eb90416154a3bf43cb05a8db9d0ec84ff452 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 2 Aug 2013 00:01:45 +0200
Subject: [PATCH] docs: Update changelog, authors

---
 .mailmap           | 2 ++
 AUTHORS            | 1 +
 docs/changelog.rst | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/.mailmap b/.mailmap
index b38c3f66..7098b6d4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,3 +5,5 @@ Kristian Klette <klette@samfundet.no>
 Johannes Knutsen <johannes@knutseninfo.no> <johannes@iterate.no>
 Johannes Knutsen <johannes@knutseninfo.no> <johannes@barbarmaclin.(none)>
 John Bäckstrand <sopues@gmail.com> <sandos@XBMCLive.(none)>
+Alexandre Petitjean <alpetitjean@gmail.com>
+Alexandre Petitjean <alpetitjean@gmail.com> <alexandre.petitjean@lne.fr>
diff --git a/AUTHORS b/AUTHORS
index 1e3faf0e..ddb1602e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,3 +22,4 @@
 - Janez Troha <janez.troha@gmail.com>
 - Tobias Sauerwein <cgtobi@gmail.com>
 - alzeih <alzeih@gmail.com>
+- Alexandre Petitjean <alpetitjean@gmail.com>
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a8c9dee6..c2c121d5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -33,6 +33,9 @@ v0.15.0 (UNRELEASED)
   hierarchy from your Spotify account is available in Mopidy. (Fixes:
   :issue:`62`)
 
+- Fix proxy config values that was broken with the config system change in
+  0.14. (Fixes: :issue:`472`)
+
 
 v0.14.2 (2013-07-01)
 ====================