[mocha/el6: 2/2] Merge branch 'master' into el6

[Jamie Nguyen]

commit c15686483e94c2bd86a066fa8d87906c71a9f53a
Merge: 37e9f62 572204c
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sat Mar 15 10:14:36 2014 +0000

    Merge branch 'master' into el6

 .gitignore  |    1 +
 dl-tests.sh |   23 ---------------
 mocha.1     |   91 -----------------------------------------------------------
 mocha.spec  |   38 ++++++++----------------
 sources     |    3 +-
 5 files changed, 15 insertions(+), 141 deletions(-)
---