[jasmine-node/el6: 2/2] Merge branch 'master' into el6

[Jamie Nguyen]

commit 30c413c3dc319a4403b6bd4aee8afaedbf4c2079
Merge: 8298de2 d0bce29
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sat Apr 19 14:13:48 2014 +0100

    Merge branch 'master' into el6

 jasmine-node.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---