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

[Jamie Nguyen]

commit 623a836672d8d2e7ca1330298dcc65a63597d099
Merge: 7ce4a7f e96e0f5
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Jul 28 22:11:59 2013 +0100

    Merge branch 'master' into el6

 nodejs-pause.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---