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

[Jamie Nguyen]

commit 7ce4a7f22dcf4d1036a030648c308b90f0de55ae
Merge: 8d28fcb f59017f
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Jun 19 22:56:28 2013 +0100

    Merge branch 'master' into el6

 nodejs-pause.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---