[nodejs-request/el6: 5/5] Merge branch 'master' into f18

[T.C. Hollingsworth]

commit ec87fb8330fbf868f083eb18b74474cba74014f6
Merge: ef8a615 17a0803
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Jul 30 11:41:06 2013 -0700

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	nodejs-request.spec
    	sources

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