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

[Jamie Nguyen]

commit 739d910ba874c41e1e524ed4b44b44469b7fd964
Merge: 42a85d6 92c4c69
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Jul 28 22:58:20 2013 +0100

    Merge branch 'master' into el6

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