[nodejs/f20: 2/2] Merge branch 'f19' into f20

[T.C. Hollingsworth]

commit 57f00901dafbe051a2033c1a62963b46cc0731c9
Merge: 5b54d77 95269f1
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Fri Oct 18 16:13:31 2013 -0700

    Merge branch 'f19' into f20

 .gitignore  |    1 +
 nodejs.spec |    7 ++++++-
 sources     |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc nodejs.spec
index 68f4ee9,ab59144..2c09356
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -168,10 -163,14 +168,15 @@@ cp -p common.gypi %{buildroot}%{_datadi
  %{_datadir}/node/common.gypi
  
  %files docs
 -%{_defaultdocdir}/%{name}-docs-%{version}
 +%dir %{_pkgdocdir}
 +%{_pkgdocdir}/html
  
  %changelog
+ * Fri Oct 18 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.21-1
+ - new upstream release 0.10.21
+   http://blog.nodejs.org/2013/10/18/node-v0-10-21-stable/
+ - resolves an undisclosed security vulnerability in the http module
+ 
  * Tue Oct 01 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.20-1
  - new upstream release 0.10.20
    http://blog.nodejs.org/2013/09/30/node-v0-10-20-stable/