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

[T.C. Hollingsworth]

commit 026d6ad95d1820c89fed54d10222a045f0b5b0d6
Merge: 57f0090 d21c6c8
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Nov 12 14:31:17 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 2c09356,f0e8439..c34b85d
--- 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 Nov 12 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.22-1
+ - new upstream release 0.10.22
+   http://blog.nodejs.org/2013/11/12/node-v0-10-22-stable/
+ 
  * 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/