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

[Jamie Nguyen]

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

    Merge branch 'master' into f18

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