[nodejs-form-data/el6: 3/3] Merge branch 'master' into el6

[Jamie Nguyen]

commit c144a371ed61e08a51c8e20f7666f0bbc3c2b98e
Merge: 1aea1be d2775f1
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Aug 26 18:28:38 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	nodejs-form-data.spec

 .gitignore            |    1 +
 nodejs-form-data.spec |   19 +++++++++++++------
 sources               |    2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)
---