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

[John Clark Williams]

commit e3bb9cd6d5a14c94b46155eaa0bf1c4f3b331b20
Merge: 3a24b06 6125a2f
Author: Clark Williams <clark.williams at gmail.com>
Date:   Wed Feb 5 19:49:58 2014 -0600

    Merge branch 'master' into el6

 mock.spec |    2 +-
 sources   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---