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

[T.C. Hollingsworth]

commit af15f26f567e8379aed3fa5e9b1538ac730f284f
Merge: 7827874 de20ac7
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Thu Feb 19 01:02:16 2015 -0700

    Merge branch 'f20' into f21

 .gitignore  |    1 +
 nodejs.spec |    9 ++++++++-
 sources     |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---