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

[T.C. Hollingsworth]

commit 5b54d773e52935f6159428ba0edfeb755f458494
Merge: 99f22d7 ded3260
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Mon Sep 30 17:18:43 2013 -0700

    Merge branch 'f19' into f20

 .gitignore  |    1 +
 nodejs.spec |    6 +++++-
 sources     |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --cc nodejs.spec
index cbc390c,437cbd1..68f4ee9
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -168,10 -163,13 +168,14 @@@ cp -p common.gypi %{buildroot}%{_datadi
  %{_datadir}/node/common.gypi
  
  %files docs
 -%{_defaultdocdir}/%{name}-docs-%{version}
 +%dir %{_pkgdocdir}
 +%{_pkgdocdir}/html
  
  %changelog
+ * 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/
+ 
  * Wed Sep 25 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.19-1
  - new upstream release 0.10.19
    http://blog.nodejs.org/2013/09/24/node-v0-10-19-stable/