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

[T.C. Hollingsworth]

commit 29e891635d2759a7d01a9bf188178a58f4dc9676
Merge: a86df19 f46f116
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Oct 21 12:13:18 2014 -0700

    Merge branch 'f19' into f20

 nodejs.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --cc nodejs.spec
index 2c00d28,17e3b8e..4c441c3
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -171,10 -176,12 +181,13 @@@ cp -p common.gypi %{buildroot}%{_datadi
  %{_datadir}/node/common.gypi
  
  %files docs
 -%{_defaultdocdir}/%{name}-docs-%{version}
 +%dir %{_pkgdocdir}
 +%{_pkgdocdir}/html
  
  %changelog
+ * Tue Oct 21 2014 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.32-2
+ - add Provides nodejs-punycode (RHBZ#1151811)
+ 
  * Thu Sep 18 2014 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.32-1
  - new upstream release 0.10.32
    http://blog.nodejs.org/2014/08/19/node-v0-10-31-stable/