[mocha/f18: 5/5] Merge branch 'master' into f18

[Jamie Nguyen]

commit 37e9f62d11459fe35c45433dc1eca3309ff983ec
Merge: d489485 e32103a
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Aug 18 16:30:51 2013 +0100

    Merge branch 'master' into f18

 .gitignore  |    4 ++++
 dl-tests.sh |    2 +-
 mocha.spec  |   31 +++++++++++++++++++++++++------
 sources     |    4 ++--
 4 files changed, 32 insertions(+), 9 deletions(-)
---