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

[John Clark Williams]

commit f761a2dce65d6011fb6eb74312a5d71fe7803c6d
Merge: dc5dddb ad7d17c
Author: Clark Williams <clark.williams at gmail.com>
Date:   Thu Jul 17 16:17:29 2014 -0500

    Merge branch 'master' into el6

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