[vmpsd/f15] Rebase to v1.4.04

[Colin Coe]

commit 6a205d1a89fd6adbc09e72f36c391627eb5e5bf7
Author: Colin Coe <colin.coe at gmail.com>
Date:   Wed Apr 11 20:05:51 2012 +0800

    Rebase to v1.4.04

 .gitignore |    1 +
 sources    |    2 +-
 vmpsd.spec |    8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e2e3f4..48ffa52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 vmpsd-1.4.01.tar.gz
 /vmpsd-1.4.02.tar.gz
 /vmpsd-1.4.03.tar.gz
+/vmpsd-1.4.04.tar.gz
diff --git a/sources b/sources
index 445ce60..8d3133a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c8a318495b4affdea52e76b52c51b34  vmpsd-1.4.03.tar.gz
+27d8a178c3372b61e74898cec43856b8  vmpsd-1.4.04.tar.gz
diff --git a/vmpsd.spec b/vmpsd.spec
index 579b545..cfc4b62 100644
--- a/vmpsd.spec
+++ b/vmpsd.spec
@@ -1,5 +1,5 @@
 Name:		vmpsd 
-Version:	1.4.03
+Version:	1.4.04
 Release:	1%{?dist}
 Summary:	A GPL implementation of Cisco Systems' VMPS
 
@@ -72,6 +72,12 @@ fi
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Wed Apr 11 2012 Colin Coe <colin.coe at gmail.com> - 1.4.04-1
+- Rebase to latest upstream to resolve BZ754963
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.03-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Mon May 2 2011 Colin Coe <colin.coe at gmail.com> - 1.4.03-1
 - Rebase to latest upstream to resolve BZ699728