ZoL META mangled during bad GBP merge

gistfile1.txt

commit 17cf5742bd17024695babb9a13cf727981a781e4
Merge: ff3b0ca 305b1d4
Author: Darik Horn <dajhorn@vanadac.com>
Date:   Mon Sep 21 19:15:29 2015 -0400

    Merge branch 'spl-0.6.5-release' into master/ubuntu/TRUNK

commit 305b1d48ac2ef5e772d661ad632da9d8683bc086
Author: Ned Bass <bass6@llnl.gov>
Date:   Sat Sep 19 12:52:12 2015 -0700

    Tag spl-0.6.5.1
    
    META file and release log updated.
    
    Signed-off-by: Ned Bass <bass6@llnl.gov>

diff --git a/META b/META
index dd8c409..6bcf664 100644
--- a/META
+++ b/META
@@ -2,6 +2,7 @@ Meta:         1
 Name:         spl
 Branch:       1.0
 Version:      0.6.5
+Version:      0.6.5.1
 Release:      1
 Release-Tags: relext
 License:      GPL
diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in
index 6cac9c5..607ee97 100644
--- a/rpm/generic/spl-kmod.spec.in
+++ b/rpm/generic/spl-kmod.spec.in
@@ -160,6 +160,8 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep 19 2015 Ned Bass <bass6@llnl.gov>
+- Released 0.6.5.1-1, no changes from spl-0.6.5
 * Thu Sep 10 2015 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.5-1
 - Released 0.6.5-1, detailed release notes are available at:
 - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5
diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in
index 48eafe6..337aba4 100644
--- a/rpm/generic/spl.spec.in
+++ b/rpm/generic/spl.spec.in
@@ -38,6 +38,8 @@ make install DESTDIR=%{?buildroot}
 %{_mandir}/man5/*
 
 %changelog
+* Thu Sep 19 2015 Ned Bass <bass6@llnl.gov>
+- Released 0.6.5.1-1, no changes from spl-0.6.5
 * Thu Sep 10 2015 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.5-1
 - Released 0.6.5-1, detailed release notes are available at:
 - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5