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

[Jamie Nguyen]

commit e60b2089df5fed89f7e9771b0683fc96264ad3af
Merge: 12f39eb 208fc1a
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Apr 20 15:20:15 2014 +0100

    Merge branch 'master' into el6

 nodejs-i2c.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---