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

[T.C. Hollingsworth]

commit c7d9c59d376d58bc48e30d24226050228f5df1a4
Merge: 337d167 1e46137
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Feb 19 21:01:43 2014 -0700

    Merge branch 'f19' into f20
    
    Conflicts:
    	nodejs.spec

 .gitignore  |    1 +
 nodejs.spec |    8 ++++++--
 sources     |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc nodejs.spec
index 5ee32f3,87e60c3..f2fe5b5
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -162,13 -157,13 +162,17 @@@ cp -p common.gypi %{buildroot}%{_datadi
  %{_datadir}/node/common.gypi
  
  %files docs
 -%{_defaultdocdir}/%{name}-docs-%{version}
 +%dir %{_pkgdocdir}
 +%{_pkgdocdir}/html
  
  %changelog
+ * Thu Feb 20 2014 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.26-1
+ - new upstream release 0.10.25
+   http://blog.nodejs.org/2014/02/18/node-v0-10-26-stable/
+ 
 +* Fri Feb 14 2014 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.25-2
 +- rebuild for icu-53 (via v8)
 +
  * Mon Jan 27 2014 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.25-1
  - new upstream release 0.10.25
    http://blog.nodejs.org/2014/01/23/node-v0-10-25-stable/