[nodejs-npm-registry-client/f18: 2/2] Merge branch 'master' into el6

[Jamie Nguyen]

commit 0b89f5e6b86c2a92e7188940380e60e50c7c450a
Merge: 06bc17a 4a87b44
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Fri Sep 6 17:55:27 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	nodejs-npm-registry-client.spec

 .gitignore                      |    1 +
 nodejs-npm-registry-client.spec |   22 ++++++++++++++--------
 sources                         |    2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)
---