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

[John Clark Williams]

commit d24930e43480bb2149a0886b6538f1995ab0e954
Merge: f761a2d ed02f44
Author: Clark Williams <clark.williams at gmail.com>
Date:   Fri Jul 18 12:35:42 2014 -0500

    Merge branch 'master' into el6

 .gitignore |    1 +
 mock.spec  |   16 ++++++----------
 sources    |    2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)
---