[nodejs-read-package-json/f18: 3/3] Merge branch 'master' into el6

[Jamie Nguyen]

commit 4cffb0d76473572e0e121ba24a07823982ce73ce
Merge: 231783f f2fbd2a
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sat Sep 7 13:53:18 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	nodejs-read-package-json.spec

 .gitignore                    |    1 +
 nodejs-read-package-json.spec |   20 +++++++++++++++-----
 sources                       |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
---