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

[Devan Goodwin]

commit dc1bb8f4171e941dede975afe703402b81b46f19
Merge: e9c934c 6c9528a
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Mon May 12 11:18:10 2014 -0300

    Merge branch 'master' into el5

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