[mingw-postgresql/f19] New upstream release.

[mooninite]

commit 405722f40cdbdaa57887b99f27bcb7903c190591
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Mon Oct 28 01:23:47 2013 -0500

    New upstream release.

 .gitignore                      |    1 +
 mingw-postgresql.spec           |   12 ++++++
 postgresql-mingw-errno-v2.patch |   72 ---------------------------------------
 sources                         |    2 +-
 4 files changed, 14 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 692951a..6dc3c74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /postgresql-9.2.4.tar.bz2
+/postgresql-9.2.5.tar.bz2
diff --git a/mingw-postgresql.spec b/mingw-postgresql.spec
index 9103636..7496962 100644
--- a/mingw-postgresql.spec
+++ b/mingw-postgresql.spec
@@ -1,8 +1,13 @@
 %?mingw_package_header
 
 Name:           mingw-postgresql
+<<<<<<< Updated upstream
 Version:        9.2.4
 Release:        3%{?dist}
+=======
+Version:        9.2.5
+Release:        1%{?dist}
+>>>>>>> Stashed changes
 Summary:        MinGW Windows PostgreSQL library
 
 License:        PostgreSQL
@@ -191,7 +196,14 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/libpq.a $RPM_BUILD_ROOT%{mingw64_libdir}/lib
 
 
 %changelog
+<<<<<<< Updated upstream
 * Thu Aug 22 2013 Michael Cronenworth <mike at cchtml.com> - 9.2.4-3
+=======
+* Mon Oct 28 2013 Michael Cronenworth <mike at cchtml.com> - 9.2.5-1
+- New upstream release.
+
+* Thu Aug 22 2013 Michael Cronenworth <mike at cchtml.com> - 9.2.4-4
+>>>>>>> Stashed changes
 - Use upstream patch for Windows error checking
 
 * Thu Aug 15 2013 Michael Cronenworth <mike at cchtml.com> - 9.2.4-2
diff --git a/sources b/sources
index c1db9a0..dbb7b53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ee5bb53b97da7c6ad9cb0825d3300dd  postgresql-9.2.4.tar.bz2
+e8438e0ed5e6371741be7697886e7340  postgresql-9.2.5.tar.bz2