[tito/epel7: 2/2] Merge branch 'master' into epel7

[Devan Goodwin]

commit 5ee4f4ea9e52e806619d559f0e1c3eefbba7b5e3
Merge: 3d1d309 d2625c5
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Tue Dec 23 12:01:34 2014 -0400

    Merge branch 'master' into epel7

 .gitignore |    1 +
 sources    |    2 +-
 tito.spec  |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 55 insertions(+), 6 deletions(-)
---