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

[Jamie Nguyen]

commit 583192c9064ec87b6450460f0f400ffda0bc3d11
Merge: ea7f8a8 d8dfe61
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Sep 4 08:44:50 2013 +0100

    Merge branch 'master' into f18

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