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

[Jamie Nguyen]

commit fcb919955725e6aeeefcc1a777d35330f5f31e31
Merge: ea7f8a8 d8dfe61
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Sep 4 08:46:34 2013 +0100

    Merge branch 'master' into el6

 .gitignore        |    1 +
 jasmine-node.spec |   15 +++++++++++----
 sources           |    2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---