From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 18 Feb 2013 23:16:05 +0000 (+0000)
Subject: To 2.2.25, and beyond
X-Git-Tag: 2.2.25~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fccd936cc525437759acd60457b528a836f90268;p=thirdparty%2Fapache%2Fhttpd.git

To 2.2.25, and beyond

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1447547 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index e8dd9ef8135..0eaca3a73c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.25
+
+
+
 Changes with Apache 2.2.24
 
   *) SECURITY: CVE-2012-3499 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index 0df0c5d230d..2911ee21add 100644
--- a/STATUS
+++ b/STATUS
@@ -23,6 +23,7 @@ Patches considered for backport are noted in their branches' STATUS:
 Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
+    2.2.25  : In maintenance
     2.2.24  : Tagged February 18, 2012
     2.2.23  : Released September 13, 2012
     2.2.22  : Released January 31, 2012.
diff --git a/include/ap_release.h b/include/ap_release.h
index f8b45f1ea45..543ffc427ce 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -45,8 +45,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   24
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   25
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */