[nodejs-semver/el6: 2/2] Merge branch 'master' into f18

[T.C. Hollingsworth]

commit ad203a4c5ed0b7f4712f55f3b29e2fbd1122f916
Merge: 4fe9b69 3f1fb2a
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Jul 30 11:42:19 2013 -0700

    Merge branch 'master' into f18

 .gitignore         |    1 +
 nodejs-semver.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---