From 991187e433b53782e8c7d0801039482756636642 Mon Sep 17 00:00:00 2001
From: T.C. Hollingsworth <tchollingsworth@gmail.com>
Date: Dec 19 2013 18:12:03 +0000
Subject: Merge branch 'master' into f18


---

diff --git a/.gitignore b/.gitignore
index dd63bf2..6d9fdb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /libuv-v0.10.18.tar.gz
 /libuv-v0.10.19.tar.gz
 /libuv-v0.10.20.tar.gz
+/libuv.spec
diff --git a/libuv.spec b/libuv.spec
index f9c1ae4..441bfca 100644
--- a/libuv.spec
+++ b/libuv.spec
@@ -4,7 +4,7 @@
 
 Name: libuv
 Epoch:   1
-Version: 0.10.20
+Version: 0.10.21
 Release: 1%{?dist}
 Summary: Platform layer for node.js
 
@@ -98,6 +98,10 @@ sed -e "s#@prefix@#%{_prefix}#g" \
 %{_includedir}/uv-private
 
 %changelog
+* Thu Dec 19 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.21-1
+- new upstream release 0.10.21
+  https://github.com/joyent/libuv/blob/v0.10.21/ChangeLog
+
 * Thu Dec 12 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 1:0.10.20-1
 - new upstream release 0.10.20
   https://github.com/joyent/libuv/blob/v0.10.20/ChangeLog
diff --git a/sources b/sources
index 25faf70..42b43d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb82eab28a64747455f1830b51fee0eb  libuv-v0.10.20.tar.gz
+ee17db987d1cfb8f20da3362cd39f23d  libuv.spec