[v9_8] prep 9.8.7

2014-01-27 10:59:48 -08:00
parent 32bad09460
commit 41232ea84b
3 changed files with 4 additions and 7 deletions
@@ -1,3 +1,5 @@
+	--- 9.8.7 released ---
+
 	--- 9.8.7rc2 released ---

 3710.	[bug]		Address double dns_zone_detach when switching to
@@ -14,11 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# <<<<<<< HEAD
-# $Id: COPYRIGHT,v 1.17.14.2 2012/01/04 23:46:18 tbox Exp $
-#
-# =======
-# >>>>>>> f0f4bda... [v9_9] correct copyrights and attributions
 # From configure.in Revision: 1.512.8.15 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
@@ -8,6 +8,6 @@ DESCRIPTION=
 MAJORVER=9
 MINORVER=8
 PATCHVER=7
-RELEASETYPE=rc
-RELEASEVER=2
+RELEASETYPE=
+RELEASEVER=
 EXTENSIONS=