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

[Jamie Nguyen]

commit d8d8ee5e0eed0c674aef081b9e0d3ec4b876c72b
Merge: 6bb9e7a d2775f1
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Aug 26 18:29:10 2013 +0100

    Merge branch 'master' into f19

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