release version 2.5.02.5.0

8 files changed, 38 insertions, 13 deletions

diff --git a/Documentation/RelNotes/2.4.2.txt b/Documentation/RelNotes/2.5.0.txt
index f927762..e117e34 100644
--- a/Documentation/RelNotes/2.4.2.txt
+++ b/Documentation/RelNotes/2.5.0.txt
@@ -1,7 +1,25 @@
-Magit v2.4.2 Release Notes (draft)
-==================================
+It's Magit!  A Git Porcelain inside Emacs
+=========================================
 
-Updates since v2.4.1
+Magit is an interface to the version control system Git, implemented
+as an Emacs package.  Magit aspires to be a complete Git porcelain.
+While we cannot (yet) claim that Magit wraps and improves upon each
+and every Git command, it is complete enough to allow even experienced
+Git users to perform almost all of their daily version control tasks
+directly from within Emacs.  While many fine Git clients exist, only
+Magit and Git itself deserve to be called porcelains.
+
+For more information about Magit, see http://magit.vc.
+
+Magit v2.5.0 Release Notes
+==========================
+
+Released 30 January 2016 by Jonas Bernoulli.
+
+We are pleased to announce the release of Magit version 2.5.0,
+representing 78 commits by 4 contributors over 2 weeks.
+
+Changes since v2.4.0
 --------------------
 
 * The library `with-editor.el' reincarnated as a separate repository.
@@ -61,7 +79,7 @@ Updates since v2.4.1
   The new option `magit-clone-set-remote-head' can be set to `t' to
   go back to keeping that symbolic-ref.  We default to removing it,
   because it does not actually get automatically updated when the
-  HEAD of the remote changes, and that makes it rather pointless.
+  HEAD of the remote changes, which makes it rather pointless.
 
 * Added new option `magit-prefer-remote-upstream' which controls
   whether commands which read the upstream or starting-point from
@@ -75,7 +93,7 @@ Updates since v2.4.1
   and its value are converted to `--VALUE-order' before calling `git'.
   This option was added instead of the switches `--author-date-order',
   `--date-order', and `--topo-order' because adding all three would be
-  to noisy and because they are mutually exclusive.
+  too noisy and because they are mutually exclusive.
 
 Fixes since v2.4.1
 ------------------
@@ -102,7 +120,14 @@ Fixes since v2.4.1
 
 * Pressing RET on a variable in a popup causes an error.
 
-This release also contains typofixes and documentation updates.
+This release also contains the fixes described in the v2.4.1 release
+notes, as well as various typofixes, documentation updates, code
+clean-ups, bug fixes, and other small improvements.
 
 Authors
 -------
+
+    62  Jonas Bernoulli
+     9  Kyle Meyer
+     4  Noam Postavsky
+     3  Alex Dunn
diff --git a/Documentation/magit-popup.org b/Documentation/magit-popup.org
index 61aa069..88e17b5 100644
--- a/Documentation/magit-popup.org
+++ b/Documentation/magit-popup.org
@@ -7,7 +7,7 @@
 #+TEXINFO_DIR_CATEGORY: Emacs
 #+TEXINFO_DIR_TITLE: Magit-Popup: (magit-popup).
 #+TEXINFO_DIR_DESC: Infix arguments with feedback
-#+SUBTITLE: for version 2.4
+#+SUBTITLE: for version 2.5
 
 #+OPTIONS: H:4 num:3 toc:2
 
diff --git a/Documentation/magit-popup.texi b/Documentation/magit-popup.texi
index d6af8ed..8752757 100644
--- a/Documentation/magit-popup.texi
+++ b/Documentation/magit-popup.texi
@@ -37,7 +37,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit-Popup User Manual
-@subtitle for version 2.4
+@subtitle for version 2.5
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
diff --git a/Documentation/magit.org b/Documentation/magit.org
index e5a5059..d3f4fb7 100644
--- a/Documentation/magit.org
+++ b/Documentation/magit.org
@@ -7,7 +7,7 @@
 #+TEXINFO_DIR_CATEGORY: Emacs
 #+TEXINFO_DIR_TITLE: Magit: (magit).
 #+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
-#+SUBTITLE: for version 2.4
+#+SUBTITLE: for version 2.5
 
 #+OPTIONS: H:4 num:3 toc:2
 
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index d193079..250bdb5 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -40,7 +40,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Magit User Manual
-@subtitle for version 2.4
+@subtitle for version 2.5
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 0eee778..b37abe0 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -11,7 +11,7 @@
 ;;	Marius Vollmer <marius.vollmer@gmail.com>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (dash "20151021.113") (with-editor "20160128.1201"))
+;; Package-Requires: ((emacs "24.4") (dash "2.12.1") (with-editor "2.5.0"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
index 6119f7c..1a7f587 100644
--- a/lisp/magit-popup.el
+++ b/lisp/magit-popup.el
@@ -12,7 +12,7 @@
 ;; Author: Jonas Bernoulli <jonas@bernoul.li>
 ;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
 
-;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1"))
 ;; Keywords: bindings
 ;; Homepage: https://github.com/magit/magit
 
diff --git a/lisp/magit.el b/lisp/magit.el
index 1480f7f..8e87180 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -16,7 +16,7 @@
 ;;	Rémi Vanicat      <vanicat@debian.org>
 ;;	Yann Hodique      <yann.hodique@gmail.com>
 
-;; Package-Requires: ((emacs "24.4") (async "20150909.2257") (dash "20151021.113") (with-editor "20160128.1201") (git-commit "20160119.1409") (magit-popup "20160119.1409"))
+;; Package-Requires: ((emacs "24.4") (async "1.5") (dash "2.12.1") (with-editor "2.5.0") (git-commit "2.4.1") (magit-popup "2.4.1"))
 ;; Keywords: git tools vc
 ;; Homepage: https://github.com/magit/magit