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

[Jamie Nguyen]

commit e1d617269fde030789430837f0f15c31d95231fd
Merge: 676097d eccf084
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sat Sep 7 13:40:00 2013 +0100

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

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