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

[Jamie Nguyen]

commit 54843b1dee3d5723cf30b1c925e413e44453f114
Merge: d240033 882cb47
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Tue Nov 11 14:13:19 2014 +0000

    Merge branch 'master' into el6

 mocha.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---