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

[T.C. Hollingsworth]

commit fcecc0e5342bd9bf5e635a8b7c98c6fc3e5f31b7
Merge: 626dfec 2545835
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Jul 30 11:38:01 2013 -0700

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

 .gitignore       |    1 +
 nodejs-read.spec |    7 +++++--
 sources          |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---