[nodejs-ansi/f18: 6/6] Merge branch 'master' into el6

[Jamie Nguyen]

commit 08990998e5e73855cb01df9768f207b10b2ce954
Merge: ea489a6 2107549
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Fri Sep 6 17:42:35 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	nodejs-ansi.spec
    	sources

 .gitignore             |    1 +
 nodejs-ansi-tarball.sh |    6 +++++-
 nodejs-ansi.spec       |   15 +++++++++++++--
 sources                |    2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)
---