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

[John Clark Williams]

commit d0407df4203c00b8016f68800c330763375b32a8
Merge: e47bebd 08bdeba
Author: Clark Williams <clark.williams at gmail.com>
Date:   Mon Feb 2 16:30:09 2015 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	mock.spec
    	sources

 .gitignore |    1 +
 mock.spec  |   16 +++++++++++++---
 sources    |    4 ++++
 3 files changed, 18 insertions(+), 3 deletions(-)
---
diff --cc sources
index 4b6888c,ed63a8a..df8d2a4
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +2d8d1200d850d082929e2863d7d4c54e  mock-1.2.5.tar.xz
++=======
+ b7d6c9edd9905ff765f319148a4bdf20  mock-1.2.6.tar.xz
++>>>>>>> master