[nodejs-node-uuid/el6: 2/2] Merge branch 'master' into el6

[Jamie Nguyen]

commit 468afe781f3f061212d11daa73f3f9fe31e9ace0
Merge: f6c26b9 0837bcf
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Aug 26 18:46:05 2013 +0100

    Merge branch 'master' into el6

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