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

[Jamie Nguyen]

commit 5fcb3df67aa8b6c0cc33d73c5995f62b088c32b3
Merge: 4a3064e cc8de95
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Apr 20 14:30:57 2014 +0100

    Merge branch 'master' into el6

 .gitignore           |    1 +
 nodejs-bindings.spec |   12 ++++++++++--
 sources              |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---