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

[Jamie Nguyen]

commit 3e361f86823b20e4e53d5aec19e2cbf2f6e98ec7
Merge: 6b0a4a9 80a3cda
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Aug 26 18:27:50 2013 +0100

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

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