[nodejs-semver/el6: 4/4] Merge branch 'master' into f18

[T.C. Hollingsworth]

commit 4fe9b698ecd6010697ef8528d6944f98fffc855e
Merge: 49f2984 f202154
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Fri Jul 12 05:52:08 2013 -0700

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	nodejs-semver.spec
    	sources

 .gitignore         |    1 +
 nodejs-semver.spec |    5 ++++-
 sources            |    5 +----
 3 files changed, 6 insertions(+), 5 deletions(-)
---