From 0fb9b6b2ec2167ce86c4d0a4ccf04bd01648cd94 Mon Sep 17 00:00:00 2001
From: T.C. Hollingsworth <tchollingsworth@gmail.com>
Date: Feb 20 2014 03:46:53 +0000
Subject: Merge branch 'master' into f19


---

diff --git a/.gitignore b/.gitignore
index 35a0489..2867c1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /libuv.spec
 /libuv-v0.10.21.tar.gz
 /libuv-v0.10.23.tar.gz
+/libuv-v0.10.25.tar.gz
diff --git a/libuv.spec b/libuv.spec
index 7239afb..77ddaa3 100644
--- a/libuv.spec
+++ b/libuv.spec
@@ -4,7 +4,7 @@
 
 Name: libuv
 Epoch:   1
-Version: 0.10.23
+Version: 0.10.25
 Release: 1%{?dist}
 Summary: Platform layer for node.js
 
@@ -98,6 +98,10 @@ sed -e "s#@prefix@#%{_prefix}#g" \
 %{_includedir}/uv-private
 
 %changelog
+* Thu Feb 20 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.25-1
+- new upstream release 0.10.25
+  https://github.com/joyent/libuv/blob/v0.10.25/ChangeLog
+
 * Mon Jan 27 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.23-1
 - new upstream release 0.10.23
   https://github.com/joyent/libuv/blob/v0.10.23/ChangeLog
diff --git a/sources b/sources
index 8766251..e560631 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8dcbcc3ec58f44b7ea5bb46afece294  libuv-v0.10.23.tar.gz
+329a61fa3c30acf46efef1a9221b2054  libuv-v0.10.25.tar.gz