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

[Devan Goodwin]

commit e9c934c18cf4b46216af30f9b8a560b252affa78
Merge: 7da8cf5 391c42c
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Mon May 12 08:54:14 2014 -0300

    Merge branch 'master' into el5

 .gitignore |    1 +
 sources    |    2 +-
 tito.spec  |    7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---