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

[John Clark Williams]

commit 0902cc9e3bf9b1b6d73556f79b1f26d8086658a7
Merge: e3bb9cd 6219f59
Author: Clark Williams <clark.williams at gmail.com>
Date:   Tue Mar 25 14:21:22 2014 -0500

    Merge branch 'master' into el6

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