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

[T.C. Hollingsworth]

commit 7de7b5c17202ba5ea8bd6698227c9f3e99af64dd
Merge: 2dfcabe 793585c
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Fri Sep 6 15:24:55 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 908b850,2731713..74262b6
--- 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
+ * Fri Sep 06 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.18-1
+ - new upstream release 0.10.18
+   http://blog.nodejs.org/2013/09/04/node-v0-10-18-stable/
+ 
  * Tue Aug 27 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.17-1
  - new upstream release 0.10.17
    http://blog.nodejs.org/2013/08/21/node-v0-10-17-stable/