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

[T.C. Hollingsworth]

commit f0dfcde1ad4689343e9bf3b96b136a7cf250e910
Merge: 26fd29e 29e8916
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Oct 21 12:13:23 2014 -0700

    Merge branch 'f20' into f21

 nodejs.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---