[nodejs-inherits/el6: 2/4] Merge branch 'master' of ssh://pkgs.fedoraproject.org/nodejs-inherits

[T.C. Hollingsworth]

commit e3533c3bf676f3594ff9031c7b568d8624f014be
Merge: 73cf684 286c595
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Fri Aug 16 14:44:52 2013 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/nodejs-inherits
    
    Conflicts:
    	nodejs-inherits.spec

 nodejs-inherits.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc nodejs-inherits.spec
index 9e3f185,ebdc57d..26e67f6
--- a/nodejs-inherits.spec
+++ b/nodejs-inherits.spec
@@@ -84,10 -54,9 +84,13 @@@ en
  %doc README.md LICENSE
  
  %changelog
 +* Fri Aug 16 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 2.0.0-4
 +- add some post-install hackery to work around potential RPM bug resulting in
 +  symlinks still pointing to their old locations on upgrade (RHBZ#997978)
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Sat Jul 06 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 2.0.0-3
  - only run the hack when we really need to