[nodejs-mime/f18: 3/3] Merge branch 'master' into f18

[Jamie Nguyen]

commit 1e1ddc01c8d98983bd8b4b44274152cba086dab1
Merge: 6b0a4a9 80a3cda
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Aug 26 18:29:54 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	nodejs-mime.spec

 .gitignore       |    1 +
 nodejs-mime.spec |   17 +++++++++++++----
 sources          |    2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)
---