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

[Jamie Nguyen]

commit 6535c24d96750ca550fde55a65d4a25e3c1c90cb
Merge: c156864 e2bab26
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sat Mar 15 16:06:30 2014 +0000

    Merge branch 'master' into el6

 .gitignore |    1 +
 mocha.spec |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---